From df0c0cf6c8eb6bc6d3e4df5c5e3275dc425f4f6f Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 21 Aug 2017 11:27:39 -0400 Subject: Parametrize ONAP installation repositories - Remove hardcoded repository names from installation scripts - Add parameters in Heat template - Use those parameters in the install scripts Change-Id: I3feadda7da22c282bd00618903de9aac1c01055b Issue-ID: UCA-33 Signed-off-by: Marco Platania --- boot/aai_install.sh | 3 ++- boot/appc_install.sh | 3 ++- boot/asdc_install.sh | 3 ++- boot/dcae_install.sh | 6 ++++-- boot/mr_install.sh | 3 ++- boot/mso_install.sh | 3 ++- boot/policy_install.sh | 3 ++- boot/portal_install.sh | 3 ++- boot/robot_install.sh | 3 ++- boot/sdnc_install.sh | 3 ++- boot/vid_install.sh | 3 ++- 11 files changed, 24 insertions(+), 12 deletions(-) (limited to 'boot') diff --git a/boot/aai_install.sh b/boot/aai_install.sh index bc62db9f..a09849e3 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -8,6 +8,7 @@ CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) AAI_INSTANCE=$(cat /opt/config/aai_instance.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -92,7 +93,7 @@ resolvconf -u # Run docker containers cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/aai/test-config +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO if [[ $AAI_INSTANCE == "aai_instance_1" ]] then diff --git a/boot/appc_install.sh b/boot/appc_install.sh index c2d4512c..7dfbd395 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -91,5 +92,5 @@ resolvconf -u # Clone Gerrit repository and run docker containers cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/appc/deployment.git appc +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO appc ./appc_vm_init.sh \ No newline at end of file diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh index 59d6c836..0400194c 100644 --- a/boot/asdc_install.sh +++ b/boot/asdc_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -116,7 +117,7 @@ chmod 777 /data chmod 777 /data/logs/BE chmod 777 /data/logs/FE -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/sdc.git +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO cat > /root/.bash_aliases << EOF alias dcls='/data/scripts/docker_clean.sh \$1' diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 4cf78964..058725f5 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -6,6 +6,8 @@ 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) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) +CODE_REPO=$(cat /opt/config/remote_repo.txt) +MR_REPO=$(cat /opt/config/mr_repo.txt) BASE=$(cat /opt/config/dcae_base_environment.txt) PUBLIC_NET_ID=$(cat /opt/config/public_net_id.txt) @@ -122,7 +124,7 @@ resolvconf -u # Clone Gerrit repository cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/dcae/demo/startup/controller.git dcae-startup-vm-controller +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO dcae-startup-vm-controller # Build a configuration file for the DCAE Controller. cd /opt/dcae-startup-vm-controller @@ -154,7 +156,7 @@ NEXUS-RAWURL: $NEXUS_REPO DOCKER-REGISTRY: $DOCKER_REGISTRY DOCKER-VERSION: $DOCKER_VERSION -GIT-MR-REPO: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git +GIT-MR-REPO: $MR_REPO public_net_id: $PUBLIC_NET_ID dcae_ip_addr: $DCAE_IP_ADDR diff --git a/boot/mr_install.sh b/boot/mr_install.sh index 8c6ee206..0f890572 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -91,5 +92,5 @@ resolvconf -u # Clone Gerrit repository and run docker containers cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/dcae/demo/startup/message-router.git dcae-startup-vm-message-router +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO dcae-startup-vm-message-router ./mr_vm_init.sh \ No newline at end of file diff --git a/boot/mso_install.sh b/boot/mso_install.sh index e7d47dfd..d9215b8d 100644 --- a/boot/mso_install.sh +++ b/boot/mso_install.sh @@ -8,6 +8,7 @@ CLOUD_ENV=$(cat /opt/config/cloud_env.txt) OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -92,7 +93,7 @@ resolvconf -u # Clone Gerrit repository cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/so/docker-config.git test_lab +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO test_lab MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key) echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 18cc3def..87aaca40 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -91,5 +92,5 @@ resolvconf -u # Clone Gerrit repository and run docker containers cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/policy/docker.git policy +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO policy ./policy_vm_init.sh \ No newline at end of file diff --git a/boot/portal_install.sh b/boot/portal_install.sh index 6b1c34f0..9e7ef2b5 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -92,5 +93,5 @@ resolvconf -u # Clone Gerrit repository and run docker containers mkdir -p /PROJECT/OpenSource/UbuntuEP/logs cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/portal.git +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO ./portal_vm_init.sh \ No newline at end of file diff --git a/boot/robot_install.sh b/boot/robot_install.sh index caf5bef4..81f8e798 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -93,7 +94,7 @@ resolvconf -u mkdir -p /opt/eteshare/logs mkdir -p /opt/eteshare/config cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/testsuite/properties.git testsuite/properties +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO testsuite/properties # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes if [[ $CLOUD_ENV != "rackspace" ]] diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index 88148764..5cf169c7 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -91,5 +92,5 @@ resolvconf -u # Clone Gerrit repository and run docker containers cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/sdnc/oam.git sdnc +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO sdnc ./sdnc_vm_init.sh \ No newline at end of file diff --git a/boot/vid_install.sh b/boot/vid_install.sh index d9f775cc..1ec8ae62 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -7,6 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -91,5 +92,5 @@ resolvconf -u # Clone Gerrit repository and run docker containers cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/vid.git +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO ./vid_vm_init.sh \ No newline at end of file -- cgit 1.2.3-korg