aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot/aaf_install.sh5
-rw-r--r--boot/aai_install.sh5
-rw-r--r--boot/appc_install.sh5
-rw-r--r--boot/assembly.xml23
-rw-r--r--boot/clamp_install.sh5
-rwxr-xr-xboot/dcae2_install.sh5
-rw-r--r--boot/dcae_install.sh216
-rw-r--r--boot/dcae_serv.sh116
-rw-r--r--boot/dcae_vm_init.sh8
-rw-r--r--boot/dns_install.sh9
-rw-r--r--boot/mr_install.sh7
-rw-r--r--boot/music_install.sh5
-rw-r--r--boot/nbi_install.sh5
-rw-r--r--boot/oof_install.sh5
-rw-r--r--boot/oof_vm_init.sh11
-rw-r--r--boot/openo_install.sh19
-rw-r--r--boot/policy_install.sh5
-rw-r--r--boot/pom.xml65
-rw-r--r--boot/portal_install.sh5
-rw-r--r--boot/robot_install.sh5
-rw-r--r--boot/robot_vm_init.sh1
-rw-r--r--boot/sdc_install.sh9
-rw-r--r--boot/sdnc_install.sh5
-rw-r--r--boot/sms_install.sh5
-rw-r--r--boot/so_install.sh5
-rw-r--r--boot/vid_install.sh5
-rw-r--r--heat/ONAP/onap_openstack.env27
-rw-r--r--heat/ONAP/onap_openstack.yaml251
-rw-r--r--heat/ONAP/onap_openstack_template.env17
-rwxr-xr-xpom.xml3
-rw-r--r--version.properties2
-rw-r--r--vnfs/VES/pom.xml2
-rw-r--r--vnfs/VES5.0/pom.xml2
-rw-r--r--vnfs/VESreporting_vFW/pom.xml2
-rw-r--r--vnfs/VESreporting_vFW5.0/pom.xml2
-rw-r--r--vnfs/VESreporting_vLB/pom.xml2
-rw-r--r--vnfs/VESreporting_vLB5.0/pom.xml2
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml2
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml2
-rw-r--r--vnfs/vCPE/kea-sdnc-notify-mod/pom.xml2
-rw-r--r--vnfs/vFW/pg_streams/pom.xml2
-rw-r--r--vnfs/vLB/DNSClient/pom.xml2
-rw-r--r--vnfs/vLB/DNSManager/pom.xml2
-rw-r--r--vnfs/vLB/dns_streams/pom.xml2
44 files changed, 334 insertions, 551 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/assembly.xml b/boot/assembly.xml
new file mode 100644
index 00000000..006337ce
--- /dev/null
+++ b/boot/assembly.xml
@@ -0,0 +1,23 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>boot</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>assembly.xml</exclude>
+ <exclude>pom.xml</exclude>
+ <exclude>target</exclude>
+ <exclude>.*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
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
deleted file mode 100644
index eac9a69c..00000000
--- a/boot/dcae_install.sh
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/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)
-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)
-ZONE=$(cat /opt/config/dcae_zone.txt)
-STATE=$(cat /opt/config/dcae_state.txt)
-HORIZON_URL=$(cat /opt/config/horizon_url.txt)
-OPENSTACK_USER=$(cat /opt/config/openstack_user.txt)
-OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt)
-OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)"_"$(cat /opt/config/rand_str.txt)"_dcae"
-OPENSTACK_PUBKEY=$(cat /opt/config/pub_key.txt)
-OPENSTACK_AUTH_METHOD=$(cat /opt/config/openstack_auth_method.txt)
-KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)"/v2.0"
-OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt)
-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)
-DOCKER_REGISTRY=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_VERSION=$(cat /opt/config/docker_version.txt)
-DCAE_CODE_VERSION=$(cat /opt/config/dcae_code_version.txt)
-
-DCAE_IP_ADDR=$(cat /opt/config/dcae_ip_addr.txt)
-DCAE_COLL_IP_ADDR=$(cat /opt/config/dcae_coll_ip_addr.txt)
-DCAE_DB_IP_ADDR=$(cat /opt/config/dcae_db_ip_addr.txt)
-DCAE_HDP1_IP_ADDR=$(cat /opt/config/dcae_hdp1_ip_addr.txt)
-DCAE_HDP2_IP_ADDR=$(cat /opt/config/dcae_hdp2_ip_addr.txt)
-DCAE_HDP3_IP_ADDR=$(cat /opt/config/dcae_hdp3_ip_addr.txt)
-
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
- # Add host name to /etc/host to avoid warnings in openstack images
- echo 127.0.0.1 $(hostname) >> /etc/hosts
-
- # Allow remote login as root
- mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
- cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Set private IP in /etc/network/interfaces manually in the presence of public interface
-# Some VM images don't add the private interface automatically, we have to do it during the component installation
-if [[ $CLOUD_ENV == "openstack_nofloat" ]]
-then
- CIDR=$(cat /opt/config/oam_network_cidr.txt)
- BITMASK=$(echo $CIDR | cut -d"/" -f2)
-
- # Compute the netmask based on the network cidr
- if [[ $BITMASK == "8" ]]
- then
- NETMASK=255.0.0.0
- elif [[ $BITMASK == "16" ]]
- then
- NETMASK=255.255.0.0
- elif [[ $BITMASK == "24" ]]
- then
- NETMASK=255.255.255.0
- fi
-
- echo "auto eth1" >> /etc/network/interfaces
- echo "iface eth1 inet static" >> /etc/network/interfaces
- echo " address $DCAE_IP_ADDR" >> /etc/network/interfaces
- echo " netmask $NETMASK" >> /etc/network/interfaces
- echo " mtu $MTU" >> /etc/network/interfaces
- 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 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
-chmod +x /opt/dcae_vm_init.sh
-chmod +x /opt/dcae_serv.sh
-mv /opt/dcae_serv.sh /etc/init.d
-update-rc.d dcae_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 --allow-unauthenticated 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
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
- DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
- DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
-# Clone Gerrit repository
-cd /opt
-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
-mkdir -p /opt/app/dcae-controller
-cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
-BASE: $BASE
-ZONE: $ZONE
-DNS-IP-ADDR: $DNS_IP_ADDR
-STATE: $STATE
-DCAE-VERSION: $DCAE_CODE_VERSION
-HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER
-KEYSTONE-URL: $KEYSTONE_URL
-OPENSTACK-TENANT-ID: $OPENSTACK_TENANT_ID
-OPENSTACK-TENANT-NAME: $OPENSTACK_TENANT_NAME
-OPENSTACK-REGION: $OPENSTACK_REGION
-OPENSTACK-PRIVATE-NETWORK: $OPENSTACK_PRIVATE_NETWORK
-OPENSTACK-USER: $OPENSTACK_USER
-OPENSTACK-PASSWORD: $OPENSTACK_PASSWORD
-OPENSTACK-AUTH-METHOD: $OPENSTACK_AUTH_METHOD
-OPENSTACK-KEYNAME: $OPENSTACK_KEYNAME
-OPENSTACK-PUBKEY: $OPENSTACK_PUBKEY
-
-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
-
-GIT-MR-REPO: $MR_REPO
-
-public_net_id: $PUBLIC_NET_ID
-dcae_ip_addr: $DCAE_IP_ADDR
-dcae_pstg00_ip_addr: $DCAE_DB_IP_ADDR
-dcae_coll00_ip_addr: $DCAE_COLL_IP_ADDR
-dcae_cdap00_ip_addr: $DCAE_HDP1_IP_ADDR
-dcae_cdap01_ip_addr: $DCAE_HDP2_IP_ADDR
-dcae_cdap02_ip_addr: $DCAE_HDP3_IP_ADDR
-
-EOF_CONFIG
-
-# For non-Rackspace environment DCAE needs the OS image names and flavors
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
- UBUNTU_1404_IMAGE=$(cat /opt/config/ubuntu_1404_image.txt)
- UBUNTU_1604_IMAGE=$(cat /opt/config/ubuntu_1604_image.txt)
- FLAVOR_SMALL=$(cat /opt/config/flavor_small.txt)
- FLAVOR_MEDIUM=$(cat /opt/config/flavor_medium.txt)
- FLAVOR_LARGE=$(cat /opt/config/flavor_large.txt)
- FLAVOR_XLARGE=$(cat /opt/config/flavor_xlarge.txt)
-
-cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG
-UBUNTU-1404-IMAGE: $UBUNTU_1404_IMAGE
-UBUNTU-1604-IMAGE: $UBUNTU_1604_IMAGE
-FLAVOR-SMALL: $FLAVOR_SMALL
-FLAVOR-MEDIUM: $FLAVOR_MEDIUM
-FLAVOR-LARGE: $FLAVOR_LARGE
-FLAVOR-XLARGE: $FLAVOR_XLARGE
-
-EOF_CONFIG
-fi
-
-# Add floating IP section to DCAE config file for OpenStack deployments that use floating IPs
-if [[ $CLOUD_ENV == "openstack" ]]
-then
- # Read floating IP mapping
- DCAE_FLOAT_IP_ADDR=$(cat /opt/config/dcae_float_ip.txt)
- DCAE_COLL_FLOAT_IP=$(cat /opt/config/dcae_coll_float_ip.txt)
- DCAE_DB_FLOAT_IP=$(cat /opt/config/dcae_db_float_ip.txt)
- DCAE_HDP1_FLOAT_IP=$(cat /opt/config/dcae_hdp1_float_ip.txt)
- DCAE_HDP2_FLOAT_IP=$(cat /opt/config/dcae_hdp2_float_ip.txt)
- DCAE_HDP3_FLOAT_IP=$(cat /opt/config/dcae_hdp3_float_ip.txt)
-
-cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG
-dcae_float_ip_addr: $DCAE_FLOAT_IP_ADDR
-dcae_pstg00_float_ip_addr: $DCAE_DB_FLOAT_IP
-dcae_coll00_float_ip_addr: $DCAE_COLL_FLOAT_IP
-dcae_cdap00_float_ip_addr: $DCAE_HDP1_FLOAT_IP
-dcae_cdap01_float_ip_addr: $DCAE_HDP2_FLOAT_IP
-dcae_cdap02_float_ip_addr: $DCAE_HDP3_FLOAT_IP
-EOF_CONFIG
-fi
-
-# Run docker containers
-cd /opt
-./dcae_vm_init.sh
diff --git a/boot/dcae_serv.sh b/boot/dcae_serv.sh
deleted file mode 100644
index f20a37bf..00000000
--- a/boot/dcae_serv.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-
-#############################################################################
-#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#############################################################################
-
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start daemon at boot time
-# Description: Enable service provided by daemon.
-### END INIT INFO
-
-dir="/opt"
-cmd="./dcae_vm_init.sh"
-user="root"
-
-name=`basename $0`
-pid_file="/var/run/$name.pid"
-stdout_log="/var/log/$name.log"
-stderr_log="/var/log/$name.err"
-
-get_pid() {
- cat "$pid_file"
-}
-
-is_running() {
- [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
-}
-
-case "$1" in
- start)
- if is_running; then
- echo "Already started"
- else
- echo "Starting $name"
- cd "$dir"
- if [ -z "$user" ]; then
- sudo $cmd >> "$stdout_log" 2>> "$stderr_log" &
- else
- sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
- fi
- echo $! > "$pid_file"
- if ! is_running; then
- echo "Unable to start, see $stdout_log and $stderr_log"
- exit 1
- fi
- fi
- ;;
- stop)
- if is_running; then
- echo -n "Stopping $name.."
- kill `get_pid`
- for i in {1..10}
- do
- if ! is_running; then
- break
- fi
-
- echo -n "."
- sleep 1
- done
- echo
-
- if is_running; then
- echo "Not stopped; may still be shutting down or shutdown may have failed"
- exit 1
- else
- echo "Stopped"
- if [ -f "$pid_file" ]; then
- rm "$pid_file"
- fi
- fi
- else
- echo "Not running"
- fi
- ;;
- restart)
- $0 stop
- if is_running; then
- echo "Unable to stop, will not attempt to start"
- exit 1
- fi
- $0 start
- ;;
- status)
- if is_running; then
- echo "Running"
- else
- echo "Stopped"
- exit 1
- fi
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/boot/dcae_vm_init.sh b/boot/dcae_vm_init.sh
deleted file mode 100644
index 460c3ef0..00000000
--- a/boot/dcae_vm_init.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-cd /opt/dcae-startup-vm-controller
-git pull
-bash init.sh
-make up
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/oof_vm_init.sh b/boot/oof_vm_init.sh
index 7b0cc4c9..241c484f 100644
--- a/boot/oof_vm_init.sh
+++ b/boot/oof_vm_init.sh
@@ -2,7 +2,7 @@
CERT=/opt/optf-has/aai_cert.cer
KEY=/opt/optf-has/aai_key.key
-BUNDLE=/opt/optf-has/aai_bundle.pem
+BUNDLE=/opt/optf-has/AAF_RootCA.cer
NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
@@ -16,7 +16,7 @@ COND_CONF=/opt/optf-has/conductor.conf
LOG_CONF=/opt/optf-has/log.conf
#!!! THE FOLLOWING LINE IS A PLACEHOLDER !!!
-AAI_cert=/usr/local/bin/aai_cert.cer
+AAI_cert=/usr/local/bin/AAF_RootCA.cer
IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-has"
@@ -43,6 +43,7 @@ docker pull $NEXUS_DOCKER_REPO/onap/optf-has:$DOCKER_IMAGE_VERSION
OSDF_IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-osdf"
OSDF_CONFIG=/opt/optf-osdf/config/osdf_config.yaml
+HAS_HOST=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' api)
mkdir -p /opt/optf-osdf/config
@@ -53,7 +54,7 @@ soUsername: "" # SO username for call back.
soPassword: "" # SO password for call back.
# Credentials for Conductor
-conductorUrl: https://localhost:8091/v1/plans/
+conductorUrl: http://$HAS_HOST:8091/v1/plans/
conductorUsername: admin1
conductorPassword: plan.15
conductorPingWaitTime: 60 # seconds to wait before calling the conductor retry URL
@@ -192,7 +193,7 @@ docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_
docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
-docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/bundle.pem ${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
+docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
sleep 10
@@ -228,4 +229,4 @@ curl -X POST \
}
'
-echo "Healthcheck plan inserted" \ No newline at end of file
+echo "Healthcheck plan inserted"
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/pom.xml b/boot/pom.xml
new file mode 100644
index 00000000..962d0b29
--- /dev/null
+++ b/boot/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.onap.demo.vnf</groupId>
+ <artifactId>demo-aggregator</artifactId>
+ <version>1.2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.onap.demo</groupId>
+ <artifactId>boot</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- bind to the packaging phase -->
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
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 a563fc34..437a73c2 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -22,16 +22,12 @@ parameters:
flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
- flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
-
vm_base_name: onap
key_name: onap_key
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
@@ -40,7 +36,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.0-SNAPSHOT
+ artifacts_version: 1.2.1-SNAPSHOT
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@ -54,8 +50,6 @@ parameters:
openstack_region: RegionOne
- horizon_url: PUT THE HORIZON URL HERE
-
keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
cloud_env: openstack
@@ -101,18 +95,7 @@ parameters:
# #
###########################
- dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1, R2MVP, R2, or R2PLUS)
- dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
- dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
- dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
- dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE (FOR R1 USE THE SAME AS openstack_tenant_name)
- dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE
- dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE
- dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE
- dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM
- dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER
- dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
- dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
+ dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS)
################################
# #
@@ -143,9 +126,9 @@ parameters:
aai_sparky_docker: 1.2-STAGING-latest
appc_docker: 1.3.0-SNAPSHOT-latest
so_docker: 1.2.1
- policy_docker: 1.2.0
+ policy_docker: 1.2.2
portal_docker: v2.2.0
- robot_docker: 1.2-STAGING-latest
+ robot_docker: 1.2.0
sdc_docker: 1.2-STAGING-latest
sdnc_docker: 1.3-STAGING-latest
vid_docker: 1.2.1
@@ -154,7 +137,7 @@ parameters:
mvim_docker: 1.1.2-STAGING
mvim_openstack_docker: 1.1.2-SNAPSHOT
uui_docker: latest
- esr_docker: 1.1.0-SNAPSHOT
+ esr_docker: latest
sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
dgbuilder_docker: 0.2-STAGING-latest
cli_docker: 2.0.2
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index ab2f4e99..92f119ea 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -72,10 +72,6 @@ parameters:
type: string
description: Name of the Extra Large Flavor supported by the cloud provider
- flavor_xxlarge:
- type: string
- description: Name of the Extra Extra Large Flavor supported by the cloud provider
-
vm_base_name:
type: string
description: Base name of ONAP VMs
@@ -88,9 +84,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
@@ -132,10 +129,6 @@ parameters:
type: string
description: OpenStack password or API Key
- horizon_url:
- type: string
- description: URL of OpenStack Horizon
-
keystone_url:
type: string
description: URL of OpenStack Keystone
@@ -170,6 +163,11 @@ parameters:
type: string
description: CIDR of the OAM ONAP network
+ use_oam_net_for_robot:
+ type: boolean
+ description: Whether to use oam_network for Robot VNFs or not. The default is false, which uses public_net_id. Set to true if the Robot VNFs are unable to bind to the public network (needed by TLAB).
+ default: false
+
### Private IP addresses ###
aai1_ip_addr:
type: string
@@ -220,51 +218,63 @@ parameters:
dcae_deployment_profile:
type: string
- description: DCAE deployment profile. Currently supported profiles R1, R2MVP.
+ default: R2
+ description: DCAE deployment profile. Currently supported profiles R2, R2MVP, and R2PLUS.
dnsaas_config_enabled:
type: string
- description: whether the DNSaaS configuration section is enabled
+ default: ""
+ description: (deprecated in R2) whether the DNSaaS configuration section is enabled
dnsaas_region:
type: string
- description: the region of the cloud instance providing the Designate DNS as a Service
+ default: ""
+ description: (deprecated in R2) the region of the cloud instance providing the Designate DNS as a Service
dnsaas_keystone_url:
type: string
- description: the keystone URL of the cloud instance providing the Designate DNS as a Service
+ default: ""
+ description: (deprecated in R2) the keystone URL of the cloud instance providing the Designate DNS as a Service
dnsaas_username:
type: string
- description: the username of the cloud instance providing the Designate DNS as a Service
+ default: ""
+ description: (deprecated in R2) the username of the cloud instance providing the Designate DNS as a Service
dnsaas_password:
type: string
- description: the password of the cloud instance providing the Designate DNS as a Service
+ default: ""
+ description: (deprecated in R2) the password of the cloud instance providing the Designate DNS as a Service
dnsaas_tenant_name:
type: string
- description: the name of the tenant in the cloud instance providing the Designate DNS as a Service
+ default: ""
+ description: (deprecated in R2) the name of the tenant in the cloud instance providing the Designate DNS as a Service
dcae_keystone_url:
type: string
- description: the keystone URL for DCAE to use (via MultiCloud)
+ default: ""
+ description: (deprecated in R2) the keystone URL for DCAE to use (via MultiCloud)
dcae_private_key:
type: string
- description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
+ default: ""
+ description: (deprecated in R2) the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
dcae_public_key:
type: string
- description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
+ default: ""
+ description: (deprecated in R2) the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
dcae_centos_7_image:
type: string
- description: the id/name of the CentOS 7 VM imange
+ default: ""
+ description: (deprecated in R2) the id/name of the CentOS 7 VM imange
dcae_domain:
type: string
- description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
+ default: ""
+ description: (deprecated in R2) the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
#####################
# #
@@ -629,7 +639,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 }
@@ -660,7 +670,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
@@ -688,7 +698,10 @@ resources:
echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./dns_install.sh
@@ -727,7 +740,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 }
@@ -745,7 +758,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
@@ -761,7 +774,10 @@ resources:
echo "__aai_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./aai_install.sh
@@ -798,7 +814,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 }
@@ -815,7 +831,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
@@ -830,7 +846,10 @@ resources:
echo "__aai_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./aai_install.sh
@@ -868,7 +887,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 }
@@ -891,7 +910,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
@@ -911,7 +930,10 @@ resources:
echo "__so_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./so_install.sh
@@ -949,7 +971,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 }
@@ -965,7 +987,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
@@ -978,7 +1000,10 @@ resources:
echo "__dbcl_docker__" > /opt/config/docker_version.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./mr_install.sh
@@ -1016,7 +1041,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 }
@@ -1034,6 +1059,7 @@ resources:
__aai2_ip_addr__: { get_param: aai2_ip_addr }
__appc_ip_addr__: { get_param: appc_ip_addr }
__dcae_ip_addr__: { get_param: dcae_ip_addr }
+ __dcae_collector_ip__: { get_param: dcae_ip_addr }
__so_ip_addr__: { get_param: so_ip_addr }
__mr_ip_addr__: { get_param: mr_ip_addr }
__policy_ip_addr__: { get_param: policy_ip_addr }
@@ -1053,18 +1079,22 @@ resources:
__external_dns__: { get_param: external_dns }
__ubuntu_1404_image__: { get_param: ubuntu_1404_image }
__ubuntu_1604_image__: { get_param: ubuntu_1604_image }
+ __vm_image_name__: { get_param: ubuntu_1404_image }
__vm_flavor__: { get_param: flavor_medium }
__public_net_id__: { get_param: public_net_id }
+ __oam_network_id__: { get_resource: oam_onap }
__script_version__: { get_param: artifacts_version }
__robot_repo__: { get_param: robot_repo }
__docker_version__: { get_param: robot_docker }
+ __vnf_pub_key__: { get_param: pub_key }
+ __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
template: |
#!/bin/bash
# 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
@@ -1081,6 +1111,7 @@ resources:
echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+ echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
@@ -1101,19 +1132,29 @@ resources:
echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
- echo "__vm_image_name__" > /opt/config/vm_image_name.txt
echo "__vm_flavor__" > /opt/config/vm_flavor.txt
echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
+ echo "__vm_image_name__" > /opt/config/vm_image_name.txt
echo "__script_version__" > /opt/config/script_version.txt
- echo "__public_net_id__" > /opt/config/public_net_id.txt
+ if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then
+ echo "__oam_network_id__" > /opt/config/public_net_id.txt
+ else
+ echo "__public_net_id__" > /opt/config/public_net_id.txt
+ fi
+ echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+ echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
+ echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
echo "__robot_repo__" > /opt/config/remote_repo.txt
echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./robot_install.sh
@@ -1151,7 +1192,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 }
@@ -1167,7 +1208,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
@@ -1180,7 +1221,10 @@ resources:
echo "__vid_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./vid_install.sh
@@ -1218,7 +1262,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 }
@@ -1235,7 +1279,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
@@ -1249,7 +1293,10 @@ resources:
echo "__sdnc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./sdnc_install.sh
@@ -1296,7 +1343,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 }
@@ -1316,7 +1363,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
@@ -1333,7 +1380,10 @@ resources:
echo "__sdc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./sdc_install.sh
@@ -1371,7 +1421,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 }
@@ -1389,7 +1439,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
@@ -1404,7 +1454,10 @@ resources:
echo "__portal_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./portal_install.sh
@@ -1442,7 +1495,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 }
@@ -1459,7 +1512,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
@@ -1473,7 +1526,10 @@ resources:
echo "__policy_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./policy_install.sh
@@ -1511,7 +1567,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 }
@@ -1529,7 +1585,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
@@ -1544,7 +1600,10 @@ resources:
echo "__appc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./appc_install.sh
@@ -1582,7 +1641,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 }
@@ -1604,7 +1663,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
@@ -1623,7 +1682,10 @@ resources:
echo "__clamp_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./clamp_install.sh
@@ -1661,7 +1723,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 }
@@ -1713,7 +1775,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
@@ -1765,7 +1827,10 @@ resources:
echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./openo_install.sh
@@ -1809,7 +1874,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 }
@@ -1900,7 +1965,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
@@ -1978,7 +2043,10 @@ resources:
echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./dcae2_install.sh > /tmp/dcae2_install.log 2>&1
@@ -2016,7 +2084,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 }
@@ -2032,7 +2100,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
@@ -2045,7 +2113,10 @@ resources:
echo "__external_dns__" > /opt/config/external_dns.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/music_install.sh -o /opt/music_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./music_install.sh
@@ -2083,7 +2154,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 }
@@ -2099,7 +2170,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
@@ -2112,7 +2183,10 @@ resources:
echo "__external_dns__" > /opt/config/external_dns.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/oof_install.sh -o /opt/oof_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./oof_install.sh
@@ -2150,7 +2224,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 }
@@ -2167,7 +2241,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
@@ -2181,7 +2255,10 @@ resources:
echo "__local_ip__" > /opt/config/local_ip.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./aaf_install.sh
@@ -2218,7 +2295,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 }
@@ -2235,7 +2312,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
@@ -2249,7 +2326,10 @@ resources:
echo "__local_ip__" > /opt/config/local_ip.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sms_install.sh -o /opt/sms_install.sh
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./sms_install.sh
@@ -2286,7 +2366,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 }
@@ -2305,7 +2385,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
@@ -2321,7 +2401,10 @@ resources:
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
+ apt-get -y install unzip
+ if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ 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
./nbi_install.sh
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index b731a34e..e0180c98 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
@@ -40,7 +38,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.0-SNAPSHOT
+ artifacts_version: 1.2.1-SNAPSHOT
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@ -101,18 +99,7 @@ parameters:
# #
###########################
- dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1, R2MVP, R2, or R2PLUS)
- dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
- dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
- dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
- dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE (FOR R1 USE THE SAME AS openstack_tenant_name)
- dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE
- dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE
- dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE
- dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM
- dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER
- dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
- dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
+ dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS)
################################
# #
diff --git a/pom.xml b/pom.xml
index b5c633e2..cafebb51 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<name>demo</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
@@ -40,6 +40,7 @@
</properties-->
<modules>
+ <module>boot</module>
<module>vnfs/honeycomb_plugin/sample_plugin/parent-pom</module>
<module>vnfs/vFW/pg_streams</module>
<module>vnfs/vLB/dns_streams</module>
diff --git a/version.properties b/version.properties
index 6ef50aa7..a32a56d9 100644
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
major=1
minor=2
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index 554786de..fc3f90bd 100644
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VES5.0/pom.xml b/vnfs/VES5.0/pom.xml
index cabebf64..4b150e9c 100644
--- a/vnfs/VES5.0/pom.xml
+++ b/vnfs/VES5.0/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index 5afc23e2..113319bf 100644
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VESreporting_vFW5.0/pom.xml b/vnfs/VESreporting_vFW5.0/pom.xml
index 2e0df623..216ad3a5 100644
--- a/vnfs/VESreporting_vFW5.0/pom.xml
+++ b/vnfs/VESreporting_vFW5.0/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 9a52a676..d9ffd0d8 100644
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VESreporting_vLB5.0/pom.xml b/vnfs/VESreporting_vLB5.0/pom.xml
index 70c906cf..cd2f77d2 100644
--- a/vnfs/VESreporting_vLB5.0/pom.xml
+++ b/vnfs/VESreporting_vLB5.0/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index f0656b7b..c561dcae 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index ed3b2c04..3bfe58bc 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>hc-onap</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../parent-pom/pom.xml</relativePath>
</parent>
diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
index 8e0b3a45..ea86f7ba 100644
--- a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
+++ b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index fcbd8719..b6fd63ea 100644
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 497922f3..fe2eec10 100644
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 2b948586..3cace651 100644
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 000736c4..fee77924 100644
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>