aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-11-02 15:54:17 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-02 15:54:17 +0000
commit15b42ca01dd2680fd5b164b8eb051c52b87582f6 (patch)
tree27ab3756d3e7beba697f497d741e2a54fae244f1
parenta126e03d8ea3bf506c5f78c7d70753980f042521 (diff)
parent9b00054b5826def8abd444fc9e67d806198be411 (diff)
Merge "Fix Default Gateway"
-rw-r--r--vnfs/vCPE/kea-sdnc-notify-mod/etc/kea-dhcp4.conf.example8
-rw-r--r--vnfs/vCPE/scripts/kea-dhcp4.conf9
-rw-r--r--vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf14
3 files changed, 16 insertions, 15 deletions
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 9faaf870..b5f1a697 100644
--- 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 508c0e62..d965072b 100644
--- 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 3e2287d1..170b8f3c 100644
--- 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"
+ }
]
}
]