Remove version number from keystone

- Affected components:
  - Rackspace Heat template
  - dcae_install.sh

Change-Id: I0635be8cdba305822db8c175777ecac33d3da40d
Issue-ID: INT-197
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 09a9e33..eac9a69 100644 (file)
--- 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)
 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)
 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_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index 27652a4..52827a4 100644 (file)
--- 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 "__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
             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