Merge "Use portal branch release-1.3.0"

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_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

diff --git a/boot/sdnc_vm_init.sh b/boot/sdnc_vm_init.sh
index 5e48a96..968207b 100644 (file)
--- a/boot/sdnc_vm_init.sh
+++ b/boot/sdnc_vm_init.sh
@@ -23,4 +23,7 @@ docker tag $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION on
 docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest
 
+docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ueb-listener-image:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ueb-listener-image:$DOCKER_IMAGE_VERSION onap/sdnc-ueb-listener-image:latest
+
 /opt/docker/docker-compose up -d

diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-dhcp4.conf.example b/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-dhcp4.conf.example
index 9faaf87..b5f1a69 100644 (file)
--- a/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-dhcp4.conf.example
+++ b/vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-dhcp4.conf.example
@@ -36,10 +36,10 @@
              "pools" : [ { "pool": "10.3.0.2 - 10.3.0.255"} ],
             "next-server": "10.3.0.1",
             "option-data": [
-                 {"name": "tftp-server-name",
-                  "data": "10.4.0.1"},
-                      {"name": "boot-file-name",
-                  "data": "/dev/null"}
+                      {
+                          "name": "routers",
+                          "data": "10.3.0.1"
+                      }
                ]
       }
   ]

diff --git a/vnfs/vCPE/scripts/kea-dhcp4.conf b/vnfs/vCPE/scripts/kea-dhcp4.conf
index 508c0e6..d965072 100644 (file)
--- a/vnfs/vCPE/scripts/kea-dhcp4.conf
+++ b/vnfs/vCPE/scripts/kea-dhcp4.conf
@@ -36,11 +36,12 @@
              "pools" : [ { "pool": "10.3.0.2 - 10.3.0.255"} ],
             "next-server": "10.3.0.1",
             "option-data": [
-                 {"name": "tftp-server-name",
-                  "data": "10.4.0.1"},
-                      {"name": "boot-file-name",
-                  "data": "/dev/null"}
+                      {
+                          "name": "routers",
+                          "data": "10.3.0.1"
+                      }
                ]
+
       }
   ]
 

diff --git a/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf b/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf
index 3e2287d..170b8f3 100644 (file)
--- a/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf
+++ b/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf
@@ -26,14 +26,14 @@
 # Also keep in mind that if kea doesn't receive the desired values for some
 # reason, these values will be sent to the client.
   "subnet4": [
-      {        "subnet": "10.2.0.0/24",
-             "pools" : [ { "pool": "10.2.0.2 - 10.2.0.255"} ],
-            "next-server": "10.2.0.1",
+      {        "subnet": "10.3.0.0/24",
+             "pools" : [ { "pool": "10.3.0.2 - 10.3.0.255"} ],
+            "next-server": "10.3.0.1",
             "option-data": [
-                 {"name": "tftp-server-name",
-                  "data": "10.2.0.1"},
-                      {"name": "boot-file-name",
-                  "data": "/dev/null"}
+                      {
+                          "name": "routers",
+                          "data": "10.3.0.1"
+                      }
                ]
       }
   ]