fix issues in dcae and sdc install

Change-Id: I34f95025a7add59c190a295b2b5512c356f72657
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh
index c70787f..e9edfaa 100644 (file)
--- a/boot/asdc_install.sh
+++ b/boot/asdc_install.sh
@@ -40,13 +40,14 @@ curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose
 chmod +x /opt/docker/docker-compose
 
 # Create partition and mount the external volume
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
 
 if [[ $CLOUD_ENV == "rackspace" ]]
 then
        DISK="xvdb"
 else
        DISK="vdb"
+       sed -i "s/xvdb/vdb/g" /opt/asdc_ext_volume_partitions.txt
 fi
 
 sfdisk /dev/$DISK < /opt/asdc_ext_volume_partitions.txt

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 5ee1912..f69227c 100644 (file)
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -12,7 +12,7 @@ STATE=$(cat /opt/config/dcae_state.txt)
 HORIZON_URL=$(cat /opt/config/horizon_url.txt)
 OPENSTACK_USER=$(cat /opt/config/openstack_user.txt)
 OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt)
-OPENSTACK_KEYNAME=$(cat /opt/config/openstack_key_name.txt)$(cat /opt/config/rand_str.txt)"_dcae"
+OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)$(cat /opt/config/rand_str.txt)"_dcae"
 OPENSTACK_PUBKEY=$(cat /opt/config/pub_key.txt)
 KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)
 OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt)
@@ -23,7 +23,7 @@ OPENSTACK_PRIVATE_NETWORK=$(cat /opt/config/openstack_private_network_name.txt)
 NEXUS_URL_ROOT=$(cat /opt/config/nexus_repo_root.txt)
 NEXUS_USER=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt)
-NEXUS_URL_SNAPSHOTS=$(cat /opt/config/nexus_url_snapshot.txt)
+NEXUS_URL_SNAPSHOTS=$(cat /opt/config/nexus_url_snapshots.txt)
 DOCKER_REGISTRY=$(cat /opt/config/nexus_docker_repo.txt)
 
 # Add host name to /etc/host to avoid warnings in openstack images
@@ -72,8 +72,8 @@ mkdir -p /opt/app/dcae-controller
 cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
 ZONE: $ZONE
 STATE: $STATE
-DCAE-VERSION: $ARTIFACT_VERSION
-HORIZON-URL: $HORIZON_URL"/"$OPENSTACK_USER
+DCAE-VERSION: $ARTIFACTS_VERSION
+HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER
 KEYSTONE-URL: $KEYSTONE_URL
 OPENSTACK-TENANT-ID: $OPENSTACK_TENANT_ID
 OPENSTACK-TENANT-NAME: $OPENSTACK_TENANT_NAME