Merge "Fix Default Gateway"

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"
+                      }
                ]
       }
   ]