diff options
| author |   Marco Platania <platania@research.att.com> | 2017-04-14 10:52:32 -0700 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-04-18 02:28:19 +0000 |
| commit | 7a8e05ca036d6f04a92668279a9836c2dcf93f3a (patch) | |
| tree | 289ef74144904dae9ac4375d87d9ee391a4b0c64 /boot/mso_vm_init.sh | |
| parent | 6f86bee471736d25c9f0815477f308c79833a2ee (diff) | |
fix dependency list in MSO, Portal and APPC
Change-Id: Ib50ca5531d7e7d1896746e3177705493b393da0e
Signed-off-by: Marco Platania <platania@research.att.com>
(cherry picked from commit 38a235e58cc6466e0b61d03b918c81c77ed57c79)
Diffstat (limited to 'boot/mso_vm_init.sh')
| -rw-r--r-- | boot/mso_vm_init.sh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh index ce343f09..feff9ba0 100644 --- a/boot/mso_vm_init.sh +++ b/boot/mso_vm_init.sh @@ -3,16 +3,23 @@ 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) -OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) -OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +# Deployments in OpenStack require a keystone file if [ -e /opt/config/keystone.txt ] then - KEYSTONE_URL=$(cat /opt/config/keystone.txt) + 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" + 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 # Update the MSO configuration file. @@ -31,7 +38,7 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF { "identity_services": [ - {"dcp_clli": "RAX_KEYSTONE", + {"dcp_clli": "$DCP_CLLI", "identity_url": "$KEYSTONE_URL", "mso_id": "$OPENSTACK_USERNAME", "mso_pass": "$OPENSTACK_APIKEY", @@ -39,7 +46,7 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF "member_role": "admin", "tenant_metadata": "true", "identity_server_type": "KEYSTONE", - "identity_authentication_type": "RACKSPACE_APIKEY" + "identity_authentication_type": "$AUTH_TYPE" } ] |