adding git to list of downloads

[demo.git] / boot / mso_vm_init.sh

diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh
index 1f89a4e..ce343f0 100644 (file)
--- a/boot/mso_vm_init.sh
+++ b/boot/mso_vm_init.sh
@@ -6,7 +6,14 @@ 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=latest
+export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
+
+if [ -e /opt/config/keystone.txt ]
+then
+  KEYSTONE_URL=$(cat /opt/config/keystone.txt)
+else
+  KEYSTONE_URL="https://identity.api.rackspacecloud.com/v2.0"
+fi
 
 # Update the MSO configuration file.
 read -d '' MSO_CONFIG_UPDATES <<-EOF
@@ -25,7 +32,7 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF
            "identity_services": 
                [
                    {"dcp_clli": "RAX_KEYSTONE", 
-                    "identity_url": "https://identity.api.rackspacecloud.com/v2.0", 
+                    "identity_url": "$KEYSTONE_URL",
                     "mso_id": "$OPENSTACK_USERNAME", 
                     "mso_pass": "$OPENSTACK_APIKEY", 
                     "admin_tenant": "service",