Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix dependency list in MSO, Portal and APPC
[demo.git]
/
boot
/
mso_vm_init.sh
diff --git
a/boot/mso_vm_init.sh
b/boot/mso_vm_init.sh
index
ce343f0
..
feff9ba
100644
(file)
--- 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)
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)
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
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
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.
fi
# Update the MSO configuration file.
@@
-31,7
+38,7
@@
read -d '' MSO_CONFIG_UPDATES <<-EOF
{
"identity_services":
[
{
"identity_services":
[
- {"dcp_clli": "
RAX_KEYSTONE
",
+ {"dcp_clli": "
$DCP_CLLI
",
"identity_url": "$KEYSTONE_URL",
"mso_id": "$OPENSTACK_USERNAME",
"mso_pass": "$OPENSTACK_APIKEY",
"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",
"member_role": "admin",
"tenant_metadata": "true",
"identity_server_type": "KEYSTONE",
- "identity_authentication_type": "
RACKSPACE_APIKEY
"
+ "identity_authentication_type": "
$AUTH_TYPE
"
}
]
}
]