Change onap_oam_ext network settings for vFWDT

Enable DHCP
Add static route for 10.12.0.0/16 to 10.100.0.1

Issue-ID: INT-1083
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I8a77ef475622a987000812cedc8d8f51a968ee0f

diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml
index 01398bf..d64f654 100644 (file)
--- a/deployment/heat/onap-rke/onap-oom.yaml
+++ b/deployment/heat/onap-rke/onap-oom.yaml
@@ -23,6 +23,16 @@ parameters:
     type: string
     description: CIDR of the onap_oam_ext network
 
+  oam_ext_network_host_route:
+    type: json
+    description: >
+        host routes
+        "destination": '10.12.0.0/16'
+        "nexthop": '10.100.0.1'
+    default:
+        "destination": '10.12.0.0/16'
+        "nexthop": '10.100.0.1'
+
   ubuntu_1804_image:
     type: string
     description: Name of the Ubuntu 18.04 image
@@ -172,7 +182,9 @@ resources:
       name: onap_oam_ext
       network_id: { get_resource: oam_ext_network }
       cidr: { get_param: oam_ext_network_cidr }
-      enable_dhcp: false
+      enable_dhcp: true
+      host_routes:
+      - { get_param: oam_ext_network_host_route }
       dns_nameservers: [ "8.8.8.8" ]
 
   oam_ext_router_interface:

diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index 7571d9f..ea3cc06 100644 (file)
--- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
@@ -20,6 +20,16 @@ parameters:
     type: string
     description: CIDR of the onap_oam_ext network
 
+  oam_ext_network_host_route:
+    type: json
+    description: >
+        host routes
+        "destination": '10.12.0.0/16'
+        "nexthop": '10.100.0.1'
+    default:
+        "destination": '10.12.0.0/16'
+        "nexthop": '10.100.0.1'
+
   ubuntu_1804_image:
     type: string
     description: Name of the Ubuntu 18.04 image
@@ -169,7 +179,9 @@ resources:
       name: onap_oam_ext
       network_id: { get_resource: oam_ext_network }
       cidr: { get_param: oam_ext_network_cidr }
-      enable_dhcp: false
+      enable_dhcp: true
+      host_routes:
+      - { get_param: oam_ext_network_host_route }
       dns_nameservers: [ "8.8.8.8" ]
 
   oam_ext_router_interface: