X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fmso_vm_init.sh;h=ce343f094962c4bcd0565dadc4cc9b0574295148;hb=refs%2Fheads%2Frelease-1.0.0;hp=f878f535c9c6df8d7253e3d20ca4cf489e86717a;hpb=3426556541256f93d2cba65df3b9c8d1d1772861;p=demo.git

diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh
index f878f535..230c53ee 100644
--- a/boot/mso_vm_init.sh
+++ b/boot/mso_vm_init.sh
@@ -3,10 +3,22 @@
 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)
-DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt)
-export MSO_DOCKER_IMAGE_VERSION=1.0.0
+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)
+	DCP_CLLI="DEFAULT_KEYSTONE"
+	AUTH_TYPE="USERNAME_PASSWORD"
+else
+	KEYSTONE_URL="https://identity.api.rackspacecloud.com/v2.0"
+	DCP_CLLI="RAX_KEYSTONE"
+	AUTH_TYPE="RACKSPACE_APIKEY"
+fi
 
 # Update the MSO configuration file.
 read -d '' MSO_CONFIG_UPDATES <<-EOF
@@ -24,15 +36,15 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF
 	  {
 	    "identity_services": 
 	        [
-	            {"dcp_clli": "RAX_KEYSTONE", 
-	             "identity_url": "https://identity.api.rackspacecloud.com/v2.0", 
+	            {"dcp_clli": "$DCP_CLLI", 
+	             "identity_url": "$KEYSTONE_URL",
 	             "mso_id": "$OPENSTACK_USERNAME", 
 	             "mso_pass": "$OPENSTACK_APIKEY", 
 	             "admin_tenant": "service", 
 	             "member_role": "admin", 
 	             "tenant_metadata": "true",
 	             "identity_server_type": "KEYSTONE", 
-	             "identity_authentication_type": "RACKSPACE_APIKEY"
+	             "identity_authentication_type": "$AUTH_TYPE"
 	                
 	            }
 	        ]
@@ -45,6 +57,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