diff options
| -rw-r--r-- | boot/dcae_install.sh | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 09a9e33d..eac9a69c 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -19,7 +19,7 @@ OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt) OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)"_"$(cat /opt/config/rand_str.txt)"_dcae" OPENSTACK_PUBKEY=$(cat /opt/config/pub_key.txt) OPENSTACK_AUTH_METHOD=$(cat /opt/config/openstack_auth_method.txt) -KEYSTONE_URL=$(cat /opt/config/keystone_url.txt) +KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)"/v2.0" OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt) OPENSTACK_TENANT_NAME=OPEN-ECOMP OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt) diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 74a9c8ed..7c429794 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -143,7 +143,7 @@ parameters: mr_docker: 1.1-STAGING-latest dcae_docker: 1.1-STAGING-latest policy_docker: 1.1-STAGING-latest - portal_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest sdnc_docker: 1.2-STAGING-latest diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index 4b7e9f4f..a7a98e70 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -164,7 +164,7 @@ parameters: mr_docker: 1.1-STAGING-latest dcae_docker: 1.1-STAGING-latest policy_docker: 1.1-STAGING-latest - portal_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest sdnc_docker: 1.2-STAGING-latest diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index 086eced4..df78bf6e 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -136,7 +136,7 @@ parameters: mr_docker: 1.1-STAGING-latest dcae_docker: 1.1-STAGING-latest policy_docker: 1.1-STAGING-latest - portal_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest sdnc_docker: 1.2-STAGING-latest diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index d92b3c71..89887c0a 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -96,7 +96,7 @@ parameters: mr_docker: 1.1-STAGING-latest dcae_docker: 1.1-STAGING-latest policy_docker: 1.1-STAGING-latest - portal_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest sdnc_docker: 1.2-STAGING-latest diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index 27652a4b..52827a48 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -1012,7 +1012,7 @@ resources: echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt echo "__openstack_region__" > /opt/config/openstack_region.txt echo "https://mycloud.rackspace.com/cloud" > /opt/config/horizon_url.txt - echo "https://identity.api.rackspacecloud.com/v2.0" > /opt/config/keystone_url.txt + echo "https://identity.api.rackspacecloud.com" > /opt/config/keystone_url.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt echo "__public_net_id__" > /opt/config/public_net_id.txt |