diff options
author | Marco Platania <platania@research.att.com> | 2017-04-11 18:07:58 -0400 |
---|---|---|
committer | Marco Platania <platania@research.att.com> | 2017-04-14 17:37:43 +0000 |
commit | fa8445501a329fc38ed7c475f9f9a760c52aa053 (patch) | |
tree | a9344c79a683866735789995c27bfc35aa3bb240 | |
parent | c3a5d3bb17ce54e92175d8edeb4f4fbe8ab57f9f (diff) |
fix typo in install scripts
Change-Id: Id851d45eeedb3f35c59f68862545b92b03a273f8
Signed-off-by: Marco Platania <platania@research.att.com>
(cherry picked from commit 24431f180c2c238ba23f7181121537a106ef6f32)
-rw-r--r-- | boot/aai_install.sh | 8 | ||||
-rw-r--r-- | boot/appc_install.sh | 8 | ||||
-rw-r--r-- | boot/dcae_install.sh | 8 | ||||
-rw-r--r-- | boot/dns_install.sh | 8 | ||||
-rw-r--r-- | boot/mr_install.sh | 8 | ||||
-rw-r--r-- | boot/mso_install.sh | 8 | ||||
-rw-r--r-- | boot/policy_install.sh | 8 | ||||
-rw-r--r-- | boot/portal_install.sh | 8 | ||||
-rw-r--r-- | boot/robot_install.sh | 8 | ||||
-rw-r--r-- | boot/sdc_install.sh | 92 | ||||
-rw-r--r-- | boot/sdnc_install.sh | 8 | ||||
-rw-r--r-- | boot/vid_install.sh | 8 |
12 files changed, 44 insertions, 136 deletions
diff --git a/boot/aai_install.sh b/boot/aai_install.sh index 2a994510..12e8ff9d 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -19,9 +19,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/aai_serv.sh -o /opt/aai_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_serv.sh -o /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 fe058378..0c7c5410 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/appc_vm_init.sh -o /opt/appc_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/appc_serv.sh -o /opt/appc_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/appc_vm_init.sh -o /opt/appc_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/appc_serv.sh -o /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/dcae_install.sh b/boot/dcae_install.sh index dc37a6fa..1215b70a 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -39,9 +39,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/dcae_vm_init.sh -o /opt/dcae_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/dcae_serv.sh -o /opt/dcae_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/dcae_vm_init.sh -o /opt/dcae_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/dcae_serv.sh -o /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 diff --git a/boot/dns_install.sh b/boot/dns_install.sh index 1bfa675a..cba47ef4 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # Add host name to /etc/host to avoid warnings in openstack images @@ -28,9 +28,9 @@ fi # Download script mkdir /etc/bind/zones -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/named.conf.local -o /etc/bind/named.conf.local +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/named.conf.local -o /etc/bind/named.conf.local # Set the private IP address of each ONAP VM in the Bind configuration in OpenStack deployments if [[ $CLOUD_ENV == "openstack" ]] diff --git a/boot/mr_install.sh b/boot/mr_install.sh index bc920bec..f5a27b2f 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/mr_vm_init.sh -o /opt/mr_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/mr_serv.sh -o /opt/mr_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mr_vm_init.sh -o /opt/mr_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mr_serv.sh -o /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 diff --git a/boot/mso_install.sh b/boot/mso_install.sh index 83d5f32a..d74b10ac 100644 --- a/boot/mso_install.sh +++ b/boot/mso_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -21,9 +21,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/mso_vm_init.sh -o /opt/mso_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/mso_serv.sh -o /opt/mso_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mso_vm_init.sh -o /opt/mso_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mso_serv.sh -o /opt/mso_serv.sh chmod +x /opt/mso_vm_init.sh chmod +x /opt/mso_serv.sh mv /opt/mso_serv.sh /etc/init.d diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 9b019fd4..7459119e 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/policy_vm_init.sh -o /opt/policy_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/policy_serv.sh -o /opt/policy_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/policy_vm_init.sh -o /opt/policy_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/policy_serv.sh -o /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 5e721015..0519c2db 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/portal_vm_init.sh -o /opt/portal_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/portal_serv.sh -o /opt/portal_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/portal_vm_init.sh -o /opt/portal_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/portal_serv.sh -o /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 4bb9903e..7be35756 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/robot_vm_init.sh -o /opt/robot_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/robot_serv.sh -o /opt/robot_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/robot_vm_init.sh -o /opt/robot_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/robot_serv.sh -o /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/sdc_install.sh b/boot/sdc_install.sh deleted file mode 100644 index 85dd9466..00000000 --- a/boot/sdc_install.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -# Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) - -# Add host name to /etc/host to avoid warnings in openstack images -if [[ $CLOUD_ENV == "openstack" ]] -then - echo 127.0.0.1 $(hostname) >> /etc/hosts -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 - -# Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/asdc_vm_init.sh -o /opt/asdc_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/asdc_serv.sh -o /opt/asdc_serv.sh -chmod +x /opt/asdc_vm_init.sh -chmod +x /opt/asdc_serv.sh -mv /opt/asdc_serv.sh /etc/init.d -update-rc.d asdc_serv.sh defaults - -# Download and install docker-engine and docker-compose -apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list -apt-get update -apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual -apt-get install -y docker-engine - -mkdir /opt/docker -curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/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 - -if [[ $CLOUD_ENV == "rackspace" ]] -then - DISK="xvdb" -else - DISK="vdb" -fi - -sfdisk /dev/$DISK < /opt/asdc_ext_volume_partitions.txt -mkfs -t ext4 /dev/$DISK"1" -mkdir -p /data -mount /dev/$DISK"1" /data -echo "/dev/"$DISK"1 /data ext4 errors=remount-ro,noatime,barrier=0 0 1" >> /etc/fstab - -# DNS IP address configuration -echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head -resolvconf -u - -# Clone Gerrit repository -cd /opt -mkdir -p /data/environments -mkdir -p /data/scripts -mkdir -p /data/logs/BE -mkdir -p /data/logs/FE -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 - -cat > /root/.bash_aliases << EOF -alias dcls='/data/scripts/docker_clean.sh \$1' -alias dlog='/data/scripts/docker_login.sh \$1' -alias rund='/data/scripts/docker_run.sh' -alias health='/data/scripts/docker_health.sh' -EOF - -# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes -if [[ $CLOUD_ENV == "openstack" ]] -then - sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub - grub-mkconfig -o /boot/grub/grub.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic - reboot -fi - -# Run docker containers. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted -./asdc_vm_init.sh
\ No newline at end of file diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index 0cc63b59..fbd1cb1f 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/sdnc_serv.sh -o /opt/sdnc_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/sdnc_serv.sh -o /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/vid_install.sh b/boot/vid_install.sh index ef88186e..a4b30168 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -2,7 +2,7 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt) +ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -20,9 +20,9 @@ apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate # Download scripts from Nexus -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/vid_vm_init.sh -o /opt/vid_vm_init.sh -curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/vid_serv.sh -o /opt/vid_serv.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/vid_vm_init.sh -o /opt/vid_vm_init.sh +curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/vid_serv.sh -o /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 |