From 1c79537b57c3c23352abdd9c56840c9a9a5ffa2a Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Thu, 18 May 2017 13:50:48 -0400 Subject: [PATCH] [UCA-13] Enable DNS recursive queries Change-Id: Ia0f4ca27a3f0cdd08eb830fc5d4b8c9a03ed0e62 Signed-off-by: Marco Platania --- boot/bind_options | 1 + boot/dns_install.sh | 1 + heat/OpenECOMP/onap_openstack.yaml | 3 ++- heat/OpenECOMP/onap_openstack_float.yaml | 3 ++- heat/OpenECOMP/onap_openstack_nofloat.yaml | 3 ++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/boot/bind_options b/boot/bind_options index 49957325..ed9540a3 100644 --- a/boot/bind_options +++ b/boot/bind_options @@ -10,6 +10,7 @@ options { allow-transfer { none; }; # disable zone transfers by default forwarders { + external_dns 8.8.8.8; 8.8.4.4; }; diff --git a/boot/dns_install.sh b/boot/dns_install.sh index 152a723a..58bb4d78 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -64,6 +64,7 @@ curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/named.conf.local if [[ $CLOUD_ENV != "rackspace" ]] then sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/named.conf.options + sed -i "s/external_dns/"$(cat /opt/config/external_dns.txt)"/g" /etc/bind/named.conf.options sed -i "s/aai_ip_addr/"$(cat /opt/config/aai_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml index 7237dee4..375d7816 100644 --- a/heat/OpenECOMP/onap_openstack.yaml +++ b/heat/OpenECOMP/onap_openstack.yaml @@ -377,7 +377,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __cloud_env__: { get_param: cloud_env } - + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -400,6 +400,7 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_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__/dns_install.sh -o /opt/dns_install.sh diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml index 5623e49c..977da801 100644 --- a/heat/OpenECOMP/onap_openstack_float.yaml +++ b/heat/OpenECOMP/onap_openstack_float.yaml @@ -447,7 +447,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __cloud_env__: { get_param: cloud_env } - + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -470,6 +470,7 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_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__/dns_install.sh -o /opt/dns_install.sh diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml index 2eb0c251..b0a155d4 100644 --- a/heat/OpenECOMP/onap_openstack_nofloat.yaml +++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml @@ -355,7 +355,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __cloud_env__: { get_param: cloud_env } - + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -378,6 +378,7 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_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__/dns_install.sh -o /opt/dns_install.sh -- 2.16.6