From ba2ea344e2a3335739cee2eb1dcb6f1454f58a3a Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Fri, 29 Sep 2017 14:47:33 -0400 Subject: [PATCH] Add DCAE GEN2 to Heat template - Add DCAE GEN2 VM to all Heat templates - Add DCAE-related parameters - Create new install/init scripts for DCAE Change-Id: I299ad3b2c212a05d12a109fda21ce48980ddd448 Issue-ID: INT-213 Signed-off-by: Marco Platania --- boot/dcae2_install.sh | 147 ++++++++++++++++++++++++++++++++++ boot/dcae2_serv.sh | 116 +++++++++++++++++++++++++++ boot/dcae2_vm_init.sh | 11 +++ heat/ONAP/onap_openstack.env | 14 +++- heat/ONAP/onap_openstack.yaml | 134 ++++++++++++++++++++++++++++++- heat/ONAP/onap_openstack_float.env | 14 +++- heat/ONAP/onap_openstack_float.yaml | 134 ++++++++++++++++++++++++++++++- heat/ONAP/onap_openstack_nofloat.env | 14 +++- heat/ONAP/onap_openstack_nofloat.yaml | 132 ++++++++++++++++++++++++++++++ heat/ONAP/onap_rackspace.env | 6 +- 10 files changed, 708 insertions(+), 14 deletions(-) create mode 100644 boot/dcae2_install.sh create mode 100644 boot/dcae2_serv.sh create mode 100644 boot/dcae2_vm_init.sh diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh new file mode 100644 index 00000000..df1d513c --- /dev/null +++ b/boot/dcae2_install.sh @@ -0,0 +1,147 @@ +#!/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) +EXTERNAL_DNS=$(cat /opt/config/external_dns.txt) +MAC_ADDR=$(cat /opt/config/mac_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/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 +chmod +x /opt/dcae2_vm_init.sh +chmod +x /opt/dcae2_serv.sh +mv /opt/dcae2_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-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list +apt-get update +apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual +apt-get install -y --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 + +# Build a configuration file for the DCAE Controller. +chmod 777 /opt/config/priv_key +mkdir /opt/app + +UBUNTU_1604_IMAGE=$(cat /opt/config/ubuntu_1604_image.txt) +CENTOS_7_IMAGE=$(cat /opt/config/centos_7_image.txt) +FLAVOR_MEDIUM=$(cat /opt/config/flavor_medium.txt) +SECURITY_GROUP=$(cat /opt/config/security_group.txt) +PUBLIC_NET_ID=$(cat /opt/config/public_net_id.txt) +OPENSTACK_PRIVATE_NETWORK=$(cat /opt/config/openstack_private_network_name.txt) +OPENSTACK_USER=$(cat /opt/config/openstack_user.txt) +OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt) +OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt) +KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)"/v2.0" +OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt) +OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)"_"$(cat /opt/config/rand_str.txt) +ZONE=$(cat /opt/config/dcae_zone.txt) + +cat > /opt/app/inputs.yaml << EOF_CONFIG +centos7image_id: '$CENTOS_7_IMAGE' +ubuntu1604image_id: '$UBUNTU_1604_IMAGE' +flavor_id: '$FLAVOR_MEDIUM' +security_group: '$SECURITY_GROUP' +public_net: '$PUBLIC_NET_ID' +private_net: '$OPENSTACK_PRIVATE_NETWORK' +openstack: + username: '$OPENSTACK_USER' + password: '$OPENSTACK_PASSWORD' + tenant_name: '$OPENSTACK_TENANT_ID' + auth_url: '$KEYSTONE_URL' + region: '$OPENSTACK_REGION' +keypair: '$OPENSTACK_KEYNAME' +key_filename: '/opt/dcae/key' +location_prefix: '$ZONE' +location_domain: 'onapdevlab.onap.org' +codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content' +codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts' +EOF_CONFIG + +# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes +if [[ $CLOUD_ENV != "rackspace" ]] +then + sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub + grub-mkconfig -o /boot/grub/grub.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules + echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic + reboot +fi + +# Run docker containers +cd /opt +./dcae2_vm_init.sh diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh new file mode 100644 index 00000000..bfd2ad18 --- /dev/null +++ b/boot/dcae2_serv.sh @@ -0,0 +1,116 @@ + +############################################################################# +# +# 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="./dcae2_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/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh new file mode 100644 index 00000000..b9da6844 --- /dev/null +++ b/boot/dcae2_vm_init.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +NEXUS_USER=$(cat /opt/config/nexus_username.txt) +NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt) +NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +DOCKER_VERSION=$(cat /opt/config/docker_version.txt) +ZONE=$(cat /opt/config/dcae_zone.txt) + +docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $NEXUS_DOCKER_REPO +docker pull $NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION +docker run -v /opt/config/priv_key:/opt/app/installer/config/key -v /opt/app/inputs.yaml:/opt/app/installer/config/inputs.yaml -e "LOCATION=$ZONE" $NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION \ No newline at end of file diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 7c429794..97f01922 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -12,6 +12,8 @@ parameters: ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE + centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE + flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -22,12 +24,18 @@ parameters: flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE + security_group: PUT THE NAME OF THE SECURITY GROUP HERE + vm_base_name: vm1 key_name: onap_key + dcae_key_name: dcae_key + pub_key: PUT YOUR PUBLIC KEY HERE + dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE + nexus_repo: https://nexus.onap.org/content/sites/raw nexus_docker_repo: nexus3.onap.org:10001 @@ -52,7 +60,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack @@ -141,12 +149,12 @@ parameters: appc_docker: 1.1-STAGING-latest so_docker: 1.1-STAGING-latest mr_docker: 1.1-STAGING-latest - dcae_docker: 1.1-STAGING-latest + dcae_docker: 1.1-latest policy_docker: 1.1-STAGING-latest portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest - sdnc_docker: 1.2-STAGING-latest + sdnc_docker: 1.2-SNAPSHOT-latest vid_docker: 1.1-STAGING-latest clamp_docker: 1.1-STAGING-latest msb_docker: latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 8258232e..5334be6c 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -52,6 +52,10 @@ parameters: type: string description: Name of the Ubuntu 16.04 image + centos_7_image: + type: string + description: Name of the CentOS 7 image + flavor_small: type: string description: Name of the Small Flavor supported by the cloud provider @@ -72,6 +76,10 @@ parameters: type: string description: Name of the Extra Extra Large Flavor supported by the cloud provider + security_group: + type: string + description: Security group used by DCAE GEN 2 + vm_base_name: type: string description: Base name of ONAP VMs @@ -80,10 +88,18 @@ parameters: type: string description: Public/Private key pair name + dcae_key_name: + type: string + description: Public/Private key pair name for DCAE GEN 2 + pub_key: type: string description: Public key to be installed on the compute instance + dcae_pub_key: + type: string + description: Public key to be installed on the DCAE GEN 2 compute instance + nexus_repo: type: string description: Complete URL for the Nexus repository. @@ -372,6 +388,18 @@ resources: public_key: { get_param: pub_key } save_private_key: false + # Public key used to access DCAE GEN 2 + dcae_vm_key: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: dcae_key_name } + rand: { get_resource: random-str } + public_key: { get_param: dcae_pub_key } + save_private_key: true # ONAP management private network oam_onap: @@ -1611,4 +1639,108 @@ resources: curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh cd /opt chmod +x openo_install.sh - ./openo_install.sh \ No newline at end of file + ./openo_install.sh + + + # DCAE GEN 2 Controller instantiation + dcae_c_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + + dcae_c_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: dcae_c_private_port } + + dcae_c_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-dcae-controller + params: + base: { get_param: vm_base_name } + key_name: { get_resource: dcae_vm_key } + networks: + - port: { get_resource: dcae_c_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __dns_ip_addr__: { get_param: dns_ip_addr } + __dcae_zone__: { get_param: dcae_zone } + __artifacts_version__: { get_param: artifacts_version } + __tenant_id__: { get_param: openstack_tenant_id } + __openstack_private_network_name__: { get_attr: [oam_onap, name] } + __openstack_user__: { get_param: openstack_username } + __openstack_password__: { get_param: openstack_api_key } + __key_name__: { get_param: dcae_key_name } + __pub_key__: { get_param: dcae_pub_key } + __private_key__: { get_attr: [ dcae_vm_key, private_key ] } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __docker_version__: { get_param: dcae_docker } + __dcae_repo__: { get_param: dcae_repo } + __gerrit_branch__: { get_param: dcae_branch } + __cloud_env__: { get_param: cloud_env } + __public_net_id__: { get_param: public_net_id } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __external_dns__: { get_param: external_dns } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __centos_7_image__: { get_param: centos_7_image } + __security_group__ : { get_param: security_group } + __flavor_medium__: { get_param: flavor_medium } + __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __rand_str__: { get_resource: random-str } + + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_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 + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dcae_zone__" > /opt/config/dcae_zone.txt + echo "__tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt + echo "__openstack_user__" > /opt/config/openstack_user.txt + echo "__openstack_password__" > /opt/config/openstack_password.txt + echo "__key_name__" > /opt/config/key_name.txt + echo "__pub_key__" > /opt/config/pub_key.txt + echo "__private_key__" > /opt/config/priv_key + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone_url.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__public_net_id__" > /opt/config/public_net_id.txt + echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__centos_7_image__" > /opt/config/centos_7_image.txt + echo "__security_group__" > /opt/config/security_group.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__dcae_repo__" > /opt/config/remote_repo.txt + echo "__mac_addr__" > /opt/config/mac_addr.txt + echo "__rand_str__" > /opt/config/rand_str.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh + cd /opt + chmod +x dcae2_install.sh + ./dcae2_install.sh \ No newline at end of file diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index a7a98e70..e75aafb5 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -16,6 +16,8 @@ parameters: ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE + centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE + flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -26,12 +28,18 @@ parameters: flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE + security_group: PUT THE NAME OF THE SECURITY GROUP HERE + vm_base_name: vm1 key_name: onap_key + dcae_key_name: dcae_key + pub_key: PUT YOUR PUBLIC KEY HERE + dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE + nexus_repo: https://nexus.onap.org/content/sites/raw nexus_docker_repo: nexus3.onap.org:10001 @@ -56,7 +64,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack @@ -162,12 +170,12 @@ parameters: appc_docker: 1.1-STAGING-latest so_docker: 1.1-STAGING-latest mr_docker: 1.1-STAGING-latest - dcae_docker: 1.1-STAGING-latest + dcae_docker: 1.1-latest policy_docker: 1.1-STAGING-latest portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest - sdnc_docker: 1.2-STAGING-latest + sdnc_docker: 1.2-SNAPSHOT-latest vid_docker: 1.1-STAGING-latest clamp_docker: 1.1-STAGING-latest msb_docker: latest diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index 5ee7fb7e..a507d50c 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -60,6 +60,10 @@ parameters: type: string description: Name of the Ubuntu 16.04 image + centos_7_image: + type: string + description: Name of the CentOS 7 image + flavor_small: type: string description: Name of the Small Flavor supported by the cloud provider @@ -80,6 +84,10 @@ parameters: type: string description: Name of the Extra Extra Large Flavor supported by the cloud provider + security_group: + type: string + description: Security group used by DCAE GEN 2 + vm_base_name: type: string description: Base name of ONAP VMs @@ -88,10 +96,18 @@ parameters: type: string description: Public/Private key pair name + dcae_key_name: + type: string + description: Public/Private key pair name for DCAE GEN 2 + pub_key: type: string description: Public key to be installed on the compute instance + dcae_pub_key: + type: string + description: Public key to be installed on the DCAE GEN 2 compute instance + nexus_repo: type: string description: Complete URL for the Nexus repository. @@ -415,6 +431,18 @@ resources: public_key: { get_param: pub_key } save_private_key: false + # Public key used to access DCAE GEN 2 + dcae_vm_key: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: dcae_key_name } + rand: { get_resource: random-str } + public_key: { get_param: dcae_pub_key } + save_private_key: true # ONAP management private network oam_onap: @@ -1672,4 +1700,108 @@ resources: curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh cd /opt chmod +x openo_install.sh - ./openo_install.sh \ No newline at end of file + ./openo_install.sh + + + # DCAE GEN 2 Controller instantiation + dcae_c_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + + dcae_c_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: dcae_c_private_port } + + dcae_c_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-dcae-controller + params: + base: { get_param: vm_base_name } + key_name: { get_resource: dcae_vm_key } + networks: + - port: { get_resource: dcae_c_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __dns_ip_addr__: { get_param: dns_ip_addr } + __dcae_zone__: { get_param: dcae_zone } + __artifacts_version__: { get_param: artifacts_version } + __tenant_id__: { get_param: openstack_tenant_id } + __openstack_private_network_name__: { get_attr: [oam_onap, name] } + __openstack_user__: { get_param: openstack_username } + __openstack_password__: { get_param: openstack_api_key } + __key_name__: { get_param: dcae_key_name } + __pub_key__: { get_param: dcae_pub_key } + __private_key__: { get_attr: [ dcae_vm_key, private_key ] } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __docker_version__: { get_param: dcae_docker } + __dcae_repo__: { get_param: dcae_repo } + __gerrit_branch__: { get_param: dcae_branch } + __cloud_env__: { get_param: cloud_env } + __public_net_id__: { get_param: public_net_id } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __external_dns__: { get_param: external_dns } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __centos_7_image__: { get_param: centos_7_image } + __security_group__ : { get_param: security_group } + __flavor_medium__: { get_param: flavor_medium } + __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __rand_str__: { get_resource: random-str } + + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_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 + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dcae_zone__" > /opt/config/dcae_zone.txt + echo "__tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt + echo "__openstack_user__" > /opt/config/openstack_user.txt + echo "__openstack_password__" > /opt/config/openstack_password.txt + echo "__key_name__" > /opt/config/key_name.txt + echo "__pub_key__" > /opt/config/pub_key.txt + echo "__private_key__" > /opt/config/priv_key + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone_url.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__public_net_id__" > /opt/config/public_net_id.txt + echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__centos_7_image__" > /opt/config/centos_7_image.txt + echo "__security_group__" > /opt/config/security_group.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__dcae_repo__" > /opt/config/remote_repo.txt + echo "__mac_addr__" > /opt/config/mac_addr.txt + echo "__rand_str__" > /opt/config/rand_str.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh + cd /opt + chmod +x dcae2_install.sh + ./dcae2_install.sh \ No newline at end of file diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index df78bf6e..b8aa95df 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -12,6 +12,8 @@ parameters: ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE + centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE + flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -22,12 +24,18 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + security_group: PUT THE NAME OF THE SECURITY GROUP HERE + vm_base_name: vm1 key_name: onap_key + dcae_key_name: dcae_key + pub_key: PUT YOUR PUBLIC KEY HERE + dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE + nexus_repo: https://nexus.onap.org/content/sites/raw nexus_docker_repo: nexus3.onap.org:10001 @@ -52,7 +60,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack_nofloat @@ -134,12 +142,12 @@ parameters: appc_docker: 1.1-STAGING-latest so_docker: 1.1-STAGING-latest mr_docker: 1.1-STAGING-latest - dcae_docker: 1.1-STAGING-latest + dcae_docker: 1.1-latest policy_docker: 1.1-STAGING-latest portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest - sdnc_docker: 1.2-STAGING-latest + sdnc_docker: 1.2-SNASPHOT-latest vid_docker: 1.1-STAGING-latest clamp_docker: 1.1-STAGING-latest msb_docker: latest diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 0d857ce2..31ba9768 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -52,6 +52,10 @@ parameters: type: string description: Name of the Ubuntu 16.04 image + centos_7_image: + type: string + description: Name of the CentOS 7 image + flavor_small: type: string description: Name of the Small Flavor supported by the cloud provider @@ -72,6 +76,10 @@ parameters: type: string description: Name of the Extra Extra Large Flavor supported by the cloud provider + security_group: + type: string + description: Security group used by DCAE GEN 2 + vm_base_name: type: string description: Base name of ONAP VMs @@ -80,10 +88,18 @@ parameters: type: string description: Public/Private key pair name + dcae_key_name: + type: string + description: Public/Private key pair name for DCAE GEN 2 + pub_key: type: string description: Public key to be installed on the compute instance + dcae_pub_key: + type: string + description: Public key to be installed on the DCAE GEN 2 compute instance + nexus_repo: type: string description: Complete URL for the Nexus repository. @@ -359,6 +375,18 @@ resources: public_key: { get_param: pub_key } save_private_key: false + # Public key used to access DCAE GEN 2 + dcae_vm_key: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: dcae_key_name } + rand: { get_resource: random-str } + public_key: { get_param: dcae_pub_key } + save_private_key: true # ONAP management private network oam_onap: @@ -1543,3 +1571,107 @@ resources: cd /opt chmod +x openo_install.sh ./openo_install.sh + + + # DCAE GEN 2 Controller instantiation + dcae_c_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + + dcae_c_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: dcae_c_private_port } + + dcae_c_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-dcae-controller + params: + base: { get_param: vm_base_name } + key_name: { get_resource: dcae_vm_key } + networks: + - port: { get_resource: dcae_c_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __dns_ip_addr__: { get_param: dns_ip_addr } + __dcae_zone__: { get_param: dcae_zone } + __artifacts_version__: { get_param: artifacts_version } + __tenant_id__: { get_param: openstack_tenant_id } + __openstack_private_network_name__: { get_attr: [oam_onap, name] } + __openstack_user__: { get_param: openstack_username } + __openstack_password__: { get_param: openstack_api_key } + __key_name__: { get_param: dcae_key_name } + __pub_key__: { get_param: dcae_pub_key } + __private_key__: { get_attr: [ dcae_vm_key, private_key ] } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __docker_version__: { get_param: dcae_docker } + __dcae_repo__: { get_param: dcae_repo } + __gerrit_branch__: { get_param: dcae_branch } + __cloud_env__: { get_param: cloud_env } + __public_net_id__: { get_param: public_net_id } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __external_dns__: { get_param: external_dns } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __centos_7_image__: { get_param: centos_7_image } + __security_group__ : { get_param: security_group } + __flavor_medium__: { get_param: flavor_medium } + __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __rand_str__: { get_resource: random-str } + + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_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 + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dcae_zone__" > /opt/config/dcae_zone.txt + echo "__tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt + echo "__openstack_user__" > /opt/config/openstack_user.txt + echo "__openstack_password__" > /opt/config/openstack_password.txt + echo "__key_name__" > /opt/config/key_name.txt + echo "__pub_key__" > /opt/config/pub_key.txt + echo "__private_key__" > /opt/config/priv_key + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone_url.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__public_net_id__" > /opt/config/public_net_id.txt + echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__centos_7_image__" > /opt/config/centos_7_image.txt + echo "__security_group__" > /opt/config/security_group.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__dcae_repo__" > /opt/config/remote_repo.txt + echo "__mac_addr__" > /opt/config/mac_addr.txt + echo "__rand_str__" > /opt/config/rand_str.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh + cd /opt + chmod +x dcae2_install.sh + ./dcae2_install.sh \ No newline at end of file diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index 89887c0a..72b19443 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -4,10 +4,10 @@ parameters: public_net_id: 00000000-0000-0000-0000-000000000000 - key_name: onap_key - vm_base_name: vm1 + key_name: onap_key + pub_key: INSERT YOUR PUBLIC KEY HERE nexus_repo: https://nexus.onap.org/content/sites/raw @@ -99,7 +99,7 @@ parameters: portal_docker: 1.3-STAGING-latest robot_docker: 1.1-STAGING-latest sdc_docker: 1.1-STAGING-latest - sdnc_docker: 1.2-STAGING-latest + sdnc_docker: 1.2-SNAPSHOT-latest vid_docker: 1.1-STAGING-latest clamp_docker: 1.1-STAGING-latest dgbuilder_docker: 0.1-STAGING-latest -- 2.16.6