diff options
| author |   Marco Platania <platania@research.att.com> | 2017-09-27 09:48:29 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-09-27 09:48:29 -0400 |
| commit | d061dbff7ddc500cb2f6edf2a08fbbec0954b274 (patch) | |
| tree | 03c4bdcb3328d6f4c22f9c578dfc7e5d0e4d3ae7 | |
| parent | 325305ed3683dfc8a4a22a4d755cb80c35c3c4d1 (diff) | |
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>
| -rw-r--r-- | boot/dcae_install.sh | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 2 |
2 files changed, 2 insertions, 2 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_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 |