Merge "Fix Default Gateway"

diff --git a/boot/bind_options b/boot/bind_options
index 8ef7cc0..740ffbd 100644 (file)
--- a/boot/bind_options
+++ b/boot/bind_options
@@ -10,8 +10,8 @@ options {
         allow-transfer { none; };      # disable zone transfers by default
 
         forwarders {
+                dns_forwarder;
                 external_dns;
-                8.8.8.8;
                 8.8.4.4;
         };
 

diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
index c1dbaa7..99cfd34 100644 (file)
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -103,6 +103,7 @@ chmod 777 /opt/app/config/key
 rm -rf /opt/app/inputs-templates
 mkdir -p /opt/app/inputs-templates
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/inputs.yaml
+wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/cdapinputs.yaml
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/phinputs.yaml
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/dhinputs.yaml
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/invinputs.yaml
@@ -111,6 +112,7 @@ wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositor
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/he-ip.yaml
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/hr-ip.yaml
 
+
 # generate blueprint input files
 pip install jinja2
 wget https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.deployments/releases/scripts/detemplate-bpinputs.py && (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; rm detemplate-bpinputs.py)

diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
old mode 100644 (file)
new mode 100755 (executable)
index a79b9c1..0d9bebc
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -397,7 +397,7 @@ register_dns_zone()
     fi
 
     local PROJECTID
-    PROJECTID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |sed 's/^.*"project_id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
+    PROJECTID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |grep 'project_id' |sed 's/^.*"project_id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
     if [ ! -z "$PROJECTID" ]; then 
         ### query the zone with zone id
         echo "!!!!!!> zone $ZONENAME already registered by project $PROJECTID"
@@ -416,8 +416,8 @@ register_dns_zone()
     #curl -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}"
 
     ### export ZONE id
-    #local ZONEID
-    #ZONEID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |sed 's/^.*"id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
+    local ZONEID
+    ZONEID=$(curl -v -sb  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |grep 'id' |sed 's/^.*"id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
     echo "=====> After creation, zone $ZONENAME ID is $ZONEID"
 
     ### query the zone with zone id
@@ -562,7 +562,7 @@ rm -f /opt/config/runtime.ip.cm
 
 #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 -d --name boot -v /opt/app/config:/opt/app/installer/config -e "LOCATION=$ZONE" "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
+docker run -d --name boot -v /opt/app/config:/opt/app/installer/config -e "LOCATION=$ZONE" "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
 
 
 # waiting for bootstrap to complete then starting nginx for proxying healthcheck calls