diff options
| author |   Marco Platania <platania@research.att.com> | 2017-04-12 11:12:47 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-04-14 17:39:08 +0000 |
| commit | 67f8b6279e9fe94a1aec1ea3e8d39fedaf3c1aa8 (patch) | |
| tree | 3339bf4920745dae2a470a0057ebca6b7dfa2c3d | |
| parent | 859e7d04ad1ccc20a1bb13df09e71dc714fbfb69 (diff) | |
fix issues in dcae and sdc install
Change-Id: I34f95025a7add59c190a295b2b5512c356f72657
Signed-off-by: Marco Platania <platania@research.att.com>
(cherry picked from commit d26a4b00c757202960df8e41e5a0b2eae41a2d5c)
| -rw-r--r-- | boot/asdc_install.sh | 3 | ||||
| -rw-r--r-- | boot/dcae_install.sh | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh index c70787fc..e9edfaa4 100644 --- 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 5ee19127..f69227c6 100644 --- 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 |