Create onap_oam_ext private network
Create onap_oam_ext private network for use by
vFWDT use case.
Change-Id: Icb02c6fe353c5aaebadd1e382959a9c30191cb17
Issue-ID: INT-993
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index 53f1ae1..1c96592 100644
--- a/deployment/heat/onap-rke/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env
@@ -13,6 +13,7 @@
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
oam_network_cidr: 10.0.0.0/16
+ oam_ext_network_cidr: 10.100.0.0/16
integration_gerrit_branch: master
diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml
index 763d14c..f4b21ec 100644
--- a/deployment/heat/onap-rke/onap-oom.yaml
+++ b/deployment/heat/onap-rke/onap-oom.yaml
@@ -19,6 +19,10 @@
type: string
description: CIDR of the OAM ONAP network
+ oam_ext_network_cidr:
+ type: string
+ description: CIDR of the onap_oam_ext network
+
ubuntu_1804_image:
type: string
description: Name of the Ubuntu 18.04 image
@@ -134,6 +138,13 @@
- protocol: 53
- protocol: 132
+ router:
+ type: OS::Neutron::Router
+ properties:
+ name:
+ list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']]
+ external_gateway_info:
+ network: { get_param: public_net_id }
# ONAP management private network
oam_network:
@@ -157,20 +168,31 @@
cidr: { get_param: oam_network_cidr }
dns_nameservers: [ "8.8.8.8" ]
- router:
- type: OS::Neutron::Router
- properties:
- name:
- list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']]
- external_gateway_info:
- network: { get_param: public_net_id }
-
- router_interface:
+ oam_router_interface:
type: OS::Neutron::RouterInterface
properties:
router_id: { get_resource: router }
subnet_id: { get_resource: oam_subnet }
+ oam_ext_network:
+ type: OS::Neutron::Net
+ properties:
+ name: onap_oam_ext
+
+ oam_ext_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ name: onap_oam_ext
+ network_id: { get_resource: oam_ext_network }
+ cidr: { get_param: oam_ext_network_cidr }
+ dns_nameservers: [ "8.8.8.8" ]
+
+ oam_ext_router_interface:
+ type: OS::Neutron::RouterInterface
+ properties:
+ router_id: { get_resource: router }
+ subnet_id: { get_resource: oam_ext_subnet }
+
rancher_private_port:
type: OS::Neutron::Port
properties:
diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index a00ffe6..e9342a4 100644
--- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
@@ -16,6 +16,10 @@
type: string
description: CIDR of the OAM ONAP network
+ oam_ext_network_cidr:
+ type: string
+ description: CIDR of the onap_oam_ext network
+
ubuntu_1804_image:
type: string
description: Name of the Ubuntu 18.04 image
@@ -131,6 +135,13 @@
- protocol: 53
- protocol: 132
+ router:
+ type: OS::Neutron::Router
+ properties:
+ name:
+ list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']]
+ external_gateway_info:
+ network: { get_param: public_net_id }
# ONAP management private network
oam_network:
@@ -154,20 +165,31 @@
cidr: { get_param: oam_network_cidr }
dns_nameservers: [ "8.8.8.8" ]
- router:
- type: OS::Neutron::Router
- properties:
- name:
- list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']]
- external_gateway_info:
- network: { get_param: public_net_id }
-
- router_interface:
+ oam_router_interface:
type: OS::Neutron::RouterInterface
properties:
router_id: { get_resource: router }
subnet_id: { get_resource: oam_subnet }
+ oam_ext_network:
+ type: OS::Neutron::Net
+ properties:
+ name: onap_oam_ext
+
+ oam_ext_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ name: onap_oam_ext
+ network_id: { get_resource: oam_ext_network }
+ cidr: { get_param: oam_ext_network_cidr }
+ dns_nameservers: [ "8.8.8.8" ]
+
+ oam_ext_router_interface:
+ type: OS::Neutron::RouterInterface
+ properties:
+ router_id: { get_resource: router }
+ subnet_id: { get_resource: oam_ext_subnet }
+
rancher_private_port:
type: OS::Neutron::Port
properties: