From 8a83578b5f007b4be348a969a74ad6c185c5b9e0 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Tue, 9 May 2017 12:20:28 -0400 Subject: [PATCH] [UCA-10] Fix issue with MTU size in dockers Change-Id: I19db615d3f5364d6b0894aabf5de60d192183595 Signed-off-by: Marco Platania --- boot/aai_install.sh | 14 ++++++++++++ boot/appc_install.sh | 14 ++++++++++++ boot/appc_vm_init.sh | 1 + boot/asdc_install.sh | 14 ++++++++++++ boot/dcae_install.sh | 16 +++++++++++++- boot/dcae_vm_init.sh | 2 ++ boot/mr_install.sh | 14 ++++++++++++ boot/mr_vm_init.sh | 2 ++ boot/mso_install.sh | 14 ++++++++++++ boot/mso_vm_init.sh | 1 + boot/policy_install.sh | 14 ++++++++++++ boot/policy_vm_init.sh | 2 +- boot/portal_install.sh | 14 ++++++++++++ boot/robot_install.sh | 14 ++++++++++++ boot/sdnc_install.sh | 14 ++++++++++++ boot/sdnc_vm_init.sh | 1 + boot/vid_install.sh | 14 ++++++++++++ heat/OpenECOMP/onap_openstack.yaml | 24 +++++++++++++++++++- heat/OpenECOMP/onap_openstack_float.yaml | 24 +++++++++++++++++++- heat/OpenECOMP/onap_openstack_nofloat.yaml | 35 +++++++++++++++++++++++------- 20 files changed, 236 insertions(+), 12 deletions(-) diff --git a/boot/aai_install.sh b/boot/aai_install.sh index 255e0bdc..d11e1e18 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -62,6 +62,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/appc_install.sh b/boot/appc_install.sh index 2aaca408..4df0b4b8 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh index 33177f7f..90b09eaf 100644 --- a/boot/appc_vm_init.sh +++ b/boot/appc_vm_init.sh @@ -5,6 +5,7 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) cd /opt/appc git pull diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh index 2f07b232..fa6e7994 100644 --- a/boot/asdc_install.sh +++ b/boot/asdc_install.sh @@ -80,6 +80,20 @@ mkdir -p /data mount /dev/$DISK"1" /data echo "/dev/"$DISK"1 /data ext4 errors=remount-ro,noatime,barrier=0 0 1" >> /etc/fstab +# 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 94d73e11..c8b4002d 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -93,6 +93,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 @@ -107,7 +121,7 @@ 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 +DNS-IP-ADDR: $DNS_IP_ADDR STATE: $STATE DCAE-VERSION: $DCAE_CODE_VERSION HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER diff --git a/boot/dcae_vm_init.sh b/boot/dcae_vm_init.sh index 538e7313..460c3ef0 100644 --- a/boot/dcae_vm_init.sh +++ b/boot/dcae_vm_init.sh @@ -1,5 +1,7 @@ #!/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 diff --git a/boot/mr_install.sh b/boot/mr_install.sh index ac476e59..480f2ea9 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/mr_vm_init.sh b/boot/mr_vm_init.sh index 4e0ae6fb..8b80d469 100644 --- a/boot/mr_vm_init.sh +++ b/boot/mr_vm_init.sh @@ -1,5 +1,7 @@ #!/bin/bash +export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + cd /opt/dcae-startup-vm-message-router git pull bash deploy.sh diff --git a/boot/mso_install.sh b/boot/mso_install.sh index bec76997..491db5ce 100644 --- a/boot/mso_install.sh +++ b/boot/mso_install.sh @@ -64,6 +64,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/mso_vm_init.sh b/boot/mso_vm_init.sh index 230c53ee..3387a7ae 100644 --- a/boot/mso_vm_init.sh +++ b/boot/mso_vm_init.sh @@ -7,6 +7,7 @@ DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) # Deployments in OpenStack require a keystone file if [ -e /opt/config/keystone.txt ] diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 48dcd72c..c3f72a0c 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh index 2514467c..067ab1db 100644 --- a/boot/policy_vm_init.sh +++ b/boot/policy_vm_init.sh @@ -4,7 +4,7 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) - +export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) export DOCKER_REPOSITORY=${NEXUS_DOCKER_REPO} cd /opt/policy diff --git a/boot/portal_install.sh b/boot/portal_install.sh index 39b28d96..f9ca52bb 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/robot_install.sh b/boot/robot_install.sh index 71b419c8..b5b73878 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index 8448425c..44c15580 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/boot/sdnc_vm_init.sh b/boot/sdnc_vm_init.sh index 0caaa03b..406e9216 100644 --- a/boot/sdnc_vm_init.sh +++ b/boot/sdnc_vm_init.sh @@ -4,6 +4,7 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) cd /opt/sdnc git pull diff --git a/boot/vid_install.sh b/boot/vid_install.sh index d75fa04e..2bdd89be 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -63,6 +63,20 @@ 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 +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + +if [ -s /opt/config/external_dns.txt ] +then + echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker +else + echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker +fi + +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 diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml index 701692d2..63981821 100644 --- a/heat/OpenECOMP/onap_openstack.yaml +++ b/heat/OpenECOMP/onap_openstack.yaml @@ -122,7 +122,7 @@ parameters: # Network parameters # # # ###################### - + external_dns: type: comma_delimited_list description: External DNS for OAM ONAP network @@ -420,6 +420,7 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __docker_version__: { get_param: docker_version } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -435,6 +436,7 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh @@ -487,6 +489,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -506,6 +509,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh @@ -552,6 +556,7 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -565,6 +570,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh @@ -616,6 +622,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -634,6 +641,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh @@ -681,6 +689,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -695,6 +704,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh @@ -742,6 +752,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -756,6 +767,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh @@ -815,6 +827,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -832,6 +845,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh @@ -880,6 +894,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -895,6 +910,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh @@ -967,6 +983,7 @@ resources: __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1006,6 +1023,7 @@ resources: echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh @@ -1054,6 +1072,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1069,6 +1088,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh @@ -1117,6 +1137,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1132,6 +1153,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml index 024dd2f9..47001a8b 100644 --- a/heat/OpenECOMP/onap_openstack_float.yaml +++ b/heat/OpenECOMP/onap_openstack_float.yaml @@ -122,7 +122,7 @@ parameters: # Network parameters # # # ###################### - + external_dns: type: comma_delimited_list description: External DNS for OAM ONAP network @@ -491,6 +491,7 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __docker_version__: { get_param: docker_version } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -506,6 +507,7 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh @@ -559,6 +561,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -578,6 +581,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh @@ -625,6 +629,7 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -638,6 +643,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh @@ -690,6 +696,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -708,6 +715,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh @@ -756,6 +764,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -770,6 +779,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh @@ -818,6 +828,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -832,6 +843,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh @@ -892,6 +904,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -909,6 +922,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh @@ -958,6 +972,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -973,6 +988,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh @@ -1052,6 +1068,7 @@ resources: __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip } __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip } __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1097,6 +1114,7 @@ resources: echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh @@ -1146,6 +1164,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1161,6 +1180,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh @@ -1210,6 +1230,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1225,6 +1246,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml index 50530a6e..c21ba288 100644 --- a/heat/OpenECOMP/onap_openstack_nofloat.yaml +++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml @@ -117,13 +117,17 @@ parameters: type: string description: Cloud Provider Name - ###################### # # # Network parameters # # # ###################### + external_dns: + type: comma_delimited_list + description: External DNS for OAM ONAP network + + ### Private IP addresses ### oam_network_cidr: type: string description: CIDR of the OAM ONAP network @@ -395,6 +399,7 @@ resources: __oam_network_cidr__: { get_param: oam_network_cidr } __docker_version__: { get_param: docker_version } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -412,6 +417,7 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh @@ -461,6 +467,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -482,6 +489,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh @@ -525,6 +533,7 @@ resources: __oam_network_cidr__: { get_param: oam_network_cidr } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -540,6 +549,7 @@ resources: echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh @@ -588,6 +598,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -608,6 +619,7 @@ resources: echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh @@ -652,6 +664,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -668,6 +681,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh @@ -712,6 +726,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -728,6 +743,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh @@ -749,13 +765,6 @@ resources: name: vol1-sdc-data size: 100 -# sdc_volume_attachment: -# type: OS::Cinder::VolumeAttachment -# properties: -# volume_id: { get_resource: sdc_volume_data } -# instance_uuid: { get_resource: sdc_vm } -# mountpoint: /dev/vdb - sdc_vm: type: OS::Nova::Server properties: @@ -790,6 +799,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -808,6 +818,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh @@ -852,6 +863,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -868,6 +880,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh @@ -936,6 +949,7 @@ resources: __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -976,6 +990,7 @@ resources: echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh @@ -1020,6 +1035,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1036,6 +1052,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh @@ -1081,6 +1098,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1098,6 +1116,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh -- 2.16.6