diff options
| author |   Marco Platania <platania@research.att.com> | 2017-04-19 09:31:00 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-04-19 13:32:58 +0000 |
| commit | 0c571f27e5ade6a26c2759e01a12aaba87075b58 (patch) | |
| tree | c23ec225f1619ea6333eb7d704a93c161de2b37f /boot | |
| parent | 5fd18b05424853c0b5ac1cbc1e3e43ef5e1e6170 (diff) | |
fix MSO credential issues in OpenStack
Change-Id: I2e9010d5891ddf3985f0bf431edffe543e1825c5
Signed-off-by: Marco Platania <platania@research.att.com>
(cherry picked from commit 8b1b31d313eae79e7bc016a729bf9c5c056b431a)
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/mso_vm_init.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh index feff9ba0..230c53ee 100644 --- a/boot/mso_vm_init.sh +++ b/boot/mso_vm_init.sh @@ -4,6 +4,8 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) +OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) +OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) # Deployments in OpenStack require a keystone file @@ -11,14 +13,10 @@ if [ -e /opt/config/keystone.txt ] then KEYSTONE_URL=$(cat /opt/config/keystone.txt) DCP_CLLI="DEFAULT_KEYSTONE" - OPENSTACK_USERNAME="admin" - OPENSTACK_APIKEY="encryptedPassword" AUTH_TYPE="USERNAME_PASSWORD" else KEYSTONE_URL="https://identity.api.rackspacecloud.com/v2.0" DCP_CLLI="RAX_KEYSTONE" - OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) - OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) AUTH_TYPE="RACKSPACE_APIKEY" fi |