diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-04-17 15:32:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-17 15:32:19 +0000 |
| commit | a20afb0e018475c56df50af6f7135dbb9b3e70cd (patch) | |
| tree | 3c72c1f76178ac9d36c4c1d79a32e47b06fd2a6b /boot | |
| parent | c976ce6c5d0ee9988a5592be64c5a3856de54f23 (diff) | |
| parent | 0d4045572e474080b22f81546306bae1a98afbc2 (diff) | |
Merge "Fix deployment errors in nbi cloud init"
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/nbi_install.sh | 14 | ||||
| -rw-r--r-- | boot/nbi_vm_init.sh | 11 |
2 files changed, 16 insertions, 9 deletions
diff --git a/boot/nbi_install.sh b/boot/nbi_install.sh index 71546016..079f5246 100644 --- a/boot/nbi_install.sh +++ b/boot/nbi_install.sh @@ -47,11 +47,8 @@ then ifup eth1 fi -# Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +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 @@ -62,10 +59,13 @@ mv /opt/nbi_serv.sh /etc/init.d update-rc.d nbi_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - +add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" apt-get update -apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual -apt-get install -y --allow-unauthenticated docker-engine +apt-get install -y docker-ce 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 diff --git a/boot/nbi_vm_init.sh b/boot/nbi_vm_init.sh index 9fac717b..f3bef124 100644 --- a/boot/nbi_vm_init.sh +++ b/boot/nbi_vm_init.sh @@ -4,13 +4,20 @@ 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) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +export SDC_IP=$(cat /opt/config/sdc_ip_addr.txt) +export AAI_IP=$(cat /opt/config/aai_ip_addr.txt) +export SO_IP=$(cat /opt/config/so_ip_addr.txt) # Create nbi directory -mkdir /opt/nbi +mkdir -p /opt/nbi cd /opt/nbi +echo "SDC_IP=${SDC_IP}" > .env +echo "SO_IP=${SO_IP}" >> .env +echo "AAI_IP=${AAI_IP}" >> .env + # Fetch the latest docker-compose.yml -wget -o docker-compose.yml https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master +curl -o docker-compose.yml https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master # Pull the nbi docker image from nexus # MariaDB and mongoDB will be pulled automatically from docker.io during docker-compose |