update init scripts

[demo.git] / boot / mso_vm_init.sh

diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh
index f878f53..8a8b8ed 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=1.0.0
+export MSO_DOCKER_IMAGE_VERSION=latest
+
+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", 
@@ -45,6 +52,7 @@ export MSO_CONFIG_UPDATES
 
 # Deploy the environment
 cd /opt/test_lab
+git pull
 chmod +x deploy.sh
 #This script takes in input 2 nexus repos (the first one for the MSO image, the second one for mariadb)
-./deploy.sh $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD ecomp-nexus:51211 release sfWU3DFVdBr7GVxB85mTYgAW
+./deploy.sh $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD