X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fmso_vm_init.sh;h=feff9ba0451447f9950d8af0a5490a6c54eee61b;hb=38a235e58cc6466e0b61d03b918c81c77ed57c79;hp=1f89a4ef25432c819a4fb3dde5d0dd086e317dcb;hpb=4f98547c03dc9c8a295ae46e066ff09dd961d5a3;p=demo.git

diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh
index 1f89a4ef..feff9ba0 100644
--- a/boot/mso_vm_init.sh
+++ b/boot/mso_vm_init.sh
@@ -3,10 +3,24 @@
 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=latest
+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"
+	OPENSTACK_USERNAME="admin"
+	OPENSTACK_APIKEY="encryptedPassword"
+	AUTH_TYPE="USERNAME_PASSWORD"
+else
+	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.
 read -d '' MSO_CONFIG_UPDATES <<-EOF
@@ -24,15 +38,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"
 	                
 	            }
 	        ]