summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-04-17 15:32:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-17 15:32:19 +0000
commita20afb0e018475c56df50af6f7135dbb9b3e70cd (patch)
tree3c72c1f76178ac9d36c4c1d79a32e47b06fd2a6b
parentc976ce6c5d0ee9988a5592be64c5a3856de54f23 (diff)
parent0d4045572e474080b22f81546306bae1a98afbc2 (diff)
Merge "Fix deployment errors in nbi cloud init"
-rw-r--r--boot/nbi_install.sh14
-rw-r--r--boot/nbi_vm_init.sh11
-rw-r--r--heat/ONAP/onap_openstack.yaml10
3 files changed, 24 insertions, 11 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
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 1038e326..d468ce52 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -322,7 +322,7 @@ parameters:
dcae_snmptrap_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
+ description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
dcae_ves_docker:
type: string
default: latest
@@ -378,7 +378,7 @@ parameters:
dcae_prh_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
+ description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
holmes_em_docker:
type: string
default: latest
@@ -2205,6 +2205,9 @@ resources:
__gerrit_branch__: { get_param: nbi_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
+ __sdc_ip_addr__: { get_param: sdc_ip_addr }
+ __aai1_ip_addr__: { get_param: aai1_ip_addr }
+ __so_ip_addr__: { get_param: so_ip_addr }
template: |
#!/bin/bash
@@ -2221,6 +2224,9 @@ resources:
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
+ echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+ echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt
+ echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/nbi_install.sh -o /opt/nbi_install.sh