diff options
| -rw-r--r-- | boot/appc_install.sh | 2 | ||||
| -rw-r--r-- | boot/mso_vm_init.sh | 19 | ||||
| -rw-r--r-- | boot/portal_install.sh | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/boot/appc_install.sh b/boot/appc_install.sh index 231602c9..4ee9ba99 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -16,7 +16,7 @@ fi # Download dependencies add-apt-repository -y ppa:openjdk-r/ppa apt-get update -apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate +apt-get install -y apt-transport-https ca-certificates wget openjdk-7-jdk git ntp ntpdate # Download scripts from Nexus curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh index ce343f09..feff9ba0 100644 --- 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) -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) +# Deployments in OpenStack require a keystone file 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 - 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. @@ -31,7 +38,7 @@ read -d '' MSO_CONFIG_UPDATES <<-EOF { "identity_services": [ - {"dcp_clli": "RAX_KEYSTONE", + {"dcp_clli": "$DCP_CLLI", "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", - "identity_authentication_type": "RACKSPACE_APIKEY" + "identity_authentication_type": "$AUTH_TYPE" } ] diff --git a/boot/portal_install.sh b/boot/portal_install.sh index 9f07c003..ca89a6d8 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -16,7 +16,7 @@ fi # Download dependencies add-apt-repository -y ppa:openjdk-r/ppa apt-get update -apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate +apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate # Download scripts from Nexus curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt |