From 88eeb55cade0caf1fbde24ec9012439b2a9d58c3 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 18 May 2018 16:31:17 -0700 Subject: [PATCH] Retrieve boot scripts from new demo artifact zip Remove use of the raw repo. Remove nexus_repo parameter. Add new nexus_artifact_repo parameter with default value. Change-Id: Ib502a77010258c2a7a642cd375094b336d046174 Issue-ID: INT-504 Signed-off-by: Gary Wu --- boot/aaf_install.sh | 5 +- boot/aai_install.sh | 5 +- boot/appc_install.sh | 5 +- boot/clamp_install.sh | 5 +- boot/dcae2_install.sh | 5 +- boot/dcae_install.sh | 7 +- boot/dns_install.sh | 9 ++- boot/mr_install.sh | 7 +- boot/music_install.sh | 5 +- boot/nbi_install.sh | 5 +- boot/oof_install.sh | 5 +- boot/openo_install.sh | 19 +++--- boot/policy_install.sh | 5 +- boot/portal_install.sh | 5 +- boot/robot_install.sh | 5 +- boot/robot_vm_init.sh | 1 - boot/sdc_install.sh | 9 ++- boot/sdnc_install.sh | 5 +- boot/sms_install.sh | 5 +- boot/so_install.sh | 5 +- boot/vid_install.sh | 5 +- heat/ONAP/onap_openstack.env | 2 - heat/ONAP/onap_openstack.yaml | 125 +++++++++++++++++----------------- heat/ONAP/onap_openstack_template.env | 2 - 24 files changed, 115 insertions(+), 141 deletions(-) diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh index ea80e47f..af0ebbfe 100644 --- a/boot/aaf_install.sh +++ b/boot/aaf_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make maven # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aaf_vm_init.sh -o /opt/aaf_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aaf_serv.sh -o /opt/aaf_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aaf_vm_init.sh > /opt/aaf_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aaf_serv.sh > /opt/aaf_serv.sh chmod +x /opt/aaf_vm_init.sh chmod +x /opt/aaf_serv.sh mv /opt/aaf_serv.sh /etc/init.d diff --git a/boot/aai_install.sh b/boot/aai_install.sh index 9ee49d7f..e9ff3bfc 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -55,8 +54,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai_serv.sh -o /opt/aai_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aai_vm_init.sh > /opt/aai_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aai_serv.sh > /opt/aai_serv.sh chmod +x /opt/aai_vm_init.sh chmod +x /opt/aai_serv.sh mv /opt/aai_serv.sh /etc/init.d diff --git a/boot/appc_install.sh b/boot/appc_install.sh index b241efe7..ca7a8e22 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/appc_vm_init.sh -o /opt/appc_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/appc_serv.sh -o /opt/appc_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip appc_vm_init.sh > /opt/appc_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip appc_serv.sh > /opt/appc_serv.sh chmod +x /opt/appc_vm_init.sh chmod +x /opt/appc_serv.sh mv /opt/appc_serv.sh /etc/init.d diff --git a/boot/clamp_install.sh b/boot/clamp_install.sh index 26e8f06f..0dbb8125 100644 --- a/boot/clamp_install.sh +++ b/boot/clamp_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/clamp_vm_init.sh -o /opt/clamp_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/clamp_serv.sh -o /opt/clamp_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip clamp_vm_init.sh > /opt/clamp_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip clamp_serv.sh > /opt/clamp_serv.sh chmod +x /opt/clamp_vm_init.sh chmod +x /opt/clamp_serv.sh mv /opt/clamp_serv.sh /etc/init.d diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh index 372c25b2..5a8c7072 100755 --- a/boot/dcae2_install.sh +++ b/boot/dcae2_install.sh @@ -19,7 +19,6 @@ set -ex # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -46,8 +45,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget git ntp ntpdate python python-pip # Download scripts from Nexus -curl -k "$NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_vm_init.sh" -o /opt/dcae2_vm_init.sh -curl -k "$NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_serv.sh" -o /opt/dcae2_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_vm_init.sh > /opt/dcae2_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_serv.sh > /opt/dcae2_serv.sh chmod +x /opt/dcae2_vm_init.sh chmod +x /opt/dcae2_serv.sh mv /opt/dcae2_serv.sh /etc/init.d diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index eac9a69c..ece7744b 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -25,7 +24,6 @@ OPENSTACK_TENANT_NAME=OPEN-ECOMP OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt) 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_snapshots.txt) @@ -86,8 +84,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae_vm_init.sh -o /opt/dcae_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae_serv.sh -o /opt/dcae_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae_vm_init.sh > /opt/dcae_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae_serv.sh > /opt/dcae_serv.sh chmod +x /opt/dcae_vm_init.sh chmod +x /opt/dcae_serv.sh mv /opt/dcae_serv.sh /etc/init.d @@ -152,7 +150,6 @@ NEXUS-URL-ROOT: $NEXUS_URL_ROOT NEXUS-USER: $NEXUS_USER NEXUS-PASSWORD: $NEXUS_PASSWORD NEXUS-URL-SNAPSHOTS: $NEXUS_URL_SNAPSHOTS -NEXUS-RAWURL: $NEXUS_REPO DOCKER-REGISTRY: $DOCKER_REGISTRY DOCKER-VERSION: $DOCKER_VERSION diff --git a/boot/dns_install.sh b/boot/dns_install.sh index 52b65cf6..4bfdbff4 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -60,10 +59,10 @@ apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates w # Download script mkdir /etc/bind/zones -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_ONAP -o /etc/bind/zones/db.simpledemo.onap.org -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/named.conf.local -o /etc/bind/named.conf.local +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $ZONE_FILE > /etc/bind/zones/db.simpledemo.openecomp.org +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $ZONE_ONAP > /etc/bind/zones/db.simpledemo.onap.org +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $OPTIONS_FILE > /etc/bind/named.conf.options +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip named.conf.local > /etc/bind/named.conf.local diff --git a/boot/mr_install.sh b/boot/mr_install.sh index 391e674b..bd15c97f 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -55,15 +54,15 @@ apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates w # Download scripts from Nexus # a) scripts for message router (mr) -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mr_vm_init.sh -o /opt/mr_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mr_serv.sh -o /opt/mr_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mr_vm_init.sh > /opt/mr_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mr_serv.sh > /opt/mr_serv.sh chmod +x /opt/mr_vm_init.sh chmod +x /opt/mr_serv.sh mv /opt/mr_serv.sh /etc/init.d update-rc.d mr_serv.sh defaults # b) scripts for bus controller (dbcl) -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dbcl_vm_init.sh -o /opt/dbcl_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dbcl_vm_init.sh > /opt/dbcl_vm_init.sh chmod +x /opt/dbcl_vm_init.sh # Download and install docker-engine and docker-compose diff --git a/boot/music_install.sh b/boot/music_install.sh index 759a9389..86914192 100644 --- a/boot/music_install.sh +++ b/boot/music_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/music_vm_init.sh -o /opt/music_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/music_serv.sh -o /opt/music_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip music_vm_init.sh > /opt/music_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip music_serv.sh > /opt/music_serv.sh chmod +x /opt/music_vm_init.sh chmod +x /opt/music_serv.sh mv /opt/music_serv.sh /etc/init.d diff --git a/boot/nbi_install.sh b/boot/nbi_install.sh index 079f5246..35e42ac4 100644 --- a/boot/nbi_install.sh +++ b/boot/nbi_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -51,8 +50,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates curl git ntp ntpdate make software-properties-common # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/nbi_vm_init.sh -o /opt/nbi_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/nbi_serv.sh -o /opt/nbi_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip nbi_vm_init.sh > /opt/nbi_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip nbi_serv.sh > /opt/nbi_serv.sh chmod +x /opt/nbi_vm_init.sh chmod +x /opt/nbi_serv.sh mv /opt/nbi_serv.sh /etc/init.d diff --git a/boot/oof_install.sh b/boot/oof_install.sh index 2e60eafa..d18bd575 100644 --- a/boot/oof_install.sh +++ b/boot/oof_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/oof_vm_init.sh -o /opt/oof_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/oof_serv.sh -o /opt/oof_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip oof_vm_init.sh > /opt/oof_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip oof_serv.sh > /opt/oof_serv.sh chmod +x /opt/oof_vm_init.sh chmod +x /opt/oof_serv.sh mv /opt/oof_serv.sh /etc/init.d diff --git a/boot/openo_install.sh b/boot/openo_install.sh index 5066f7b3..5cfaea4a 100644 --- a/boot/openo_install.sh +++ b/boot/openo_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,15 +53,15 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vnfsdk_vm_init.sh -o /opt/vnfsdk_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/msb_vm_init.sh -o /opt/msb_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mvim_vm_init.sh -o /opt/mvim_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vfc_vm_init.sh -o /opt/vfc_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/uui_vm_init.sh -o /opt/uui_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/openo_all_serv.sh -o /opt/openo_all_serv.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/openo_serv.sh -o /opt/openo_serv.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/cli_install.sh -o /opt/cli_install.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/esr_vm_init.sh -o /opt/esr_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vnfsdk_vm_init.sh > /opt/vnfsdk_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip msb_vm_init.sh > /opt/msb_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mvim_vm_init.sh > /opt/mvim_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vfc_vm_init.sh > /opt/vfc_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip uui_vm_init.sh > /opt/uui_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip openo_all_serv.sh > /opt/openo_all_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip openo_serv.sh > /opt/openo_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip cli_install.sh > /opt/cli_install.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip esr_vm_init.sh > /opt/esr_vm_init.sh chmod +x /opt/vnfsdk_vm_init.sh chmod +x /opt/msb_vm_init.sh chmod +x /opt/mvim_vm_init.sh diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 3f6ea5d1..0e979910 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/policy_vm_init.sh -o /opt/policy_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/policy_serv.sh -o /opt/policy_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip policy_vm_init.sh > /opt/policy_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip policy_serv.sh > /opt/policy_serv.sh chmod +x /opt/policy_vm_init.sh chmod +x /opt/policy_serv.sh mv /opt/policy_serv.sh /etc/init.d diff --git a/boot/portal_install.sh b/boot/portal_install.sh index 67512e5c..5b93c608 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/portal_vm_init.sh -o /opt/portal_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/portal_serv.sh -o /opt/portal_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip portal_vm_init.sh > /opt/portal_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip portal_serv.sh > /opt/portal_serv.sh chmod +x /opt/portal_vm_init.sh chmod +x /opt/portal_serv.sh mv /opt/portal_serv.sh /etc/init.d diff --git a/boot/robot_install.sh b/boot/robot_install.sh index b17e9fc7..9978e566 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -58,8 +57,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/robot_vm_init.sh -o /opt/robot_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/robot_serv.sh -o /opt/robot_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot_vm_init.sh > /opt/robot_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot_serv.sh > /opt/robot_serv.sh chmod +x /opt/robot_vm_init.sh chmod +x /opt/robot_serv.sh mv /opt/robot_serv.sh /etc/init.d diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh index 132fbae1..ca3a3f16 100644 --- a/boot/robot_vm_init.sh +++ b/boot/robot_vm_init.sh @@ -3,7 +3,6 @@ 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) -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) diff --git a/boot/sdc_install.sh b/boot/sdc_install.sh index 556a9b0d..6b48f557 100644 --- a/boot/sdc_install.sh +++ b/boot/sdc_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,9 +53,9 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_vm_init.sh -o /opt/sdc_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_serv.sh -o /opt/sdc_serv.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_wfd_vm_init.sh -o /opt/sdc_wfd_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_vm_init.sh > /opt/sdc_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_serv.sh > /opt/sdc_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_wfd_vm_init.sh > /opt/sdc_wfd_vm_init.sh chmod +x /opt/sdc_vm_init.sh chmod +x /opt/sdc_serv.sh chmod +x /opt/sdc_wfd_vm_init.sh @@ -74,7 +73,7 @@ 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.onap.demo/boot/$ARTIFACTS_VERSION/sdc_ext_volume_partitions.txt -o /opt/sdc_ext_volume_partitions.txt +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_ext_volume_partitions.txt > /opt/sdc_ext_volume_partitions.txt if [[ $CLOUD_ENV == "rackspace" ]] then diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index da39da5e..7ca69776 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make jq # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdnc_serv.sh -o /opt/sdnc_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdnc_vm_init.sh > /opt/sdnc_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdnc_serv.sh > /opt/sdnc_serv.sh chmod +x /opt/sdnc_vm_init.sh chmod +x /opt/sdnc_serv.sh mv /opt/sdnc_serv.sh /etc/init.d diff --git a/boot/sms_install.sh b/boot/sms_install.sh index 943ec2f3..1c8b6bae 100644 --- a/boot/sms_install.sh +++ b/boot/sms_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sms_vm_init.sh -o /opt/sms_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sms_serv.sh -o /opt/sms_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sms_vm_init.sh > /opt/sms_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sms_serv.sh > /opt/sms_serv.sh chmod +x /opt/sms_vm_init.sh chmod +x /opt/sms_serv.sh mv /opt/sms_serv.sh /etc/init.d diff --git a/boot/so_install.sh b/boot/so_install.sh index d9a8a646..77f2a7a6 100644 --- a/boot/so_install.sh +++ b/boot/so_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -55,8 +54,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/so_vm_init.sh -o /opt/so_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/so_serv.sh -o /opt/so_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip so_vm_init.sh > /opt/so_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip so_serv.sh > /opt/so_serv.sh chmod +x /opt/so_vm_init.sh chmod +x /opt/so_serv.sh mv /opt/so_serv.sh /etc/init.d diff --git a/boot/vid_install.sh b/boot/vid_install.sh index 118995c4..f1bd3cca 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -1,7 +1,6 @@ #!/bin/bash # Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -54,8 +53,8 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make # Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vid_vm_init.sh -o /opt/vid_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vid_serv.sh -o /opt/vid_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vid_vm_init.sh > /opt/vid_vm_init.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vid_serv.sh > /opt/vid_serv.sh chmod +x /opt/vid_vm_init.sh chmod +x /opt/vid_serv.sh mv /opt/vid_serv.sh /etc/init.d diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index c1eb4f49..120663bf 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -30,8 +30,6 @@ parameters: pub_key: PUT YOUR PUBLIC KEY HERE - nexus_repo: https://nexus.onap.org/content/sites/raw - nexus_docker_repo: nexus3.onap.org:10001 nexus_username: docker diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 9ac38120..2316816e 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -88,9 +88,10 @@ parameters: type: string description: Public key to be installed on the compute instance - nexus_repo: + nexus_artifact_repo: type: string - description: Complete URL for the Nexus repository. + description: Complete URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" nexus_docker_repo: type: string @@ -634,7 +635,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __artifacts_version__: { get_param: artifacts_version } __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] } __dns_ip_addr__: { get_param: dns_ip_addr } @@ -665,7 +666,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt @@ -695,7 +696,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt dns_install.sh cd /opt chmod +x dns_install.sh @@ -735,7 +736,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -753,7 +754,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -771,7 +772,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh cd /opt chmod +x aai_install.sh @@ -809,7 +810,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -826,7 +827,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -843,7 +844,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh cd /opt chmod +x aai_install.sh @@ -882,7 +883,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -905,7 +906,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -927,7 +928,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt so_install.sh cd /opt chmod +x so_install.sh @@ -966,7 +967,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -982,7 +983,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -997,7 +998,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt mr_install.sh cd /opt chmod +x mr_install.sh @@ -1036,7 +1037,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1089,7 +1090,7 @@ resources: # Create configuration files mkdir -p /opt/config echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__network_name__" > /opt/config/network.txt @@ -1148,7 +1149,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt robot_install.sh cd /opt chmod +x robot_install.sh @@ -1187,7 +1188,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1203,7 +1204,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1218,7 +1219,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt vid_install.sh cd /opt chmod +x vid_install.sh @@ -1257,7 +1258,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1274,7 +1275,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1290,7 +1291,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdnc_install.sh cd /opt chmod +x sdnc_install.sh @@ -1338,7 +1339,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1358,7 +1359,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1377,7 +1378,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdc_install.sh cd /opt chmod +x sdc_install.sh @@ -1416,7 +1417,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1434,7 +1435,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1451,7 +1452,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt portal_install.sh cd /opt chmod +x portal_install.sh @@ -1490,7 +1491,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1507,7 +1508,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1523,7 +1524,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt policy_install.sh cd /opt chmod +x policy_install.sh @@ -1562,7 +1563,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1580,7 +1581,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1597,7 +1598,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt appc_install.sh cd /opt chmod +x appc_install.sh @@ -1636,7 +1637,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1658,7 +1659,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1679,7 +1680,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt clamp_install.sh cd /opt chmod +x clamp_install.sh @@ -1718,7 +1719,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1770,7 +1771,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1824,7 +1825,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt openo_install.sh cd /opt chmod +x openo_install.sh @@ -1869,7 +1870,7 @@ resources: # repo related __artifacts_version__: { get_param: artifacts_version } __docker_version__: { get_param: dcae_docker } - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1960,7 +1961,7 @@ resources: # repo related echo "__docker_version__" > /opt/config/docker_version.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2040,7 +2041,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt dcae2_install.sh cd /opt chmod +x dcae2_install.sh @@ -2079,7 +2080,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2095,7 +2096,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2110,7 +2111,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt music_install.sh cd /opt chmod +x music_install.sh @@ -2149,7 +2150,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2165,7 +2166,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2180,7 +2181,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt oof_install.sh cd /opt chmod +x oof_install.sh @@ -2219,7 +2220,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2236,7 +2237,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2252,7 +2253,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt aaf_install.sh cd /opt chmod +x aaf_install.sh @@ -2290,7 +2291,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2307,7 +2308,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2323,7 +2324,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt sms_install.sh cd /opt chmod +x sms_install.sh @@ -2361,7 +2362,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2380,7 +2381,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2398,7 +2399,7 @@ resources: # Download and run install script apt-get -y install unzip if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip unzip -j /opt/boot-__artifacts_version__.zip -d /opt nbi_install.sh cd /opt chmod +x nbi_install.sh diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index aca40c80..6e448a3b 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -30,8 +30,6 @@ parameters: pub_key: PUT YOUR PUBLIC KEY HERE - nexus_repo: https://nexus.onap.org/content/sites/raw - nexus_docker_repo: nexus3.onap.org:10001 nexus_username: docker -- 2.16.6