aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/heat/onap-rke/env/windriver/onap-oom.env1
-rw-r--r--deployment/heat/onap-rke/onap-oom.yaml38
-rw-r--r--deployment/heat/onap-rke/parts/onap-oom-1.yaml38
3 files changed, 61 insertions, 16 deletions
diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index 53f1ae106..1c96592e2 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 @@ parameters:
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 763d14c1a..f4b21ec67 100644
--- a/deployment/heat/onap-rke/onap-oom.yaml
+++ b/deployment/heat/onap-rke/onap-oom.yaml
@@ -19,6 +19,10 @@ parameters:
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 @@ resources:
- 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,19 +168,30 @@ resources:
cidr: { get_param: oam_network_cidr }
dns_nameservers: [ "8.8.8.8" ]
- router:
- type: OS::Neutron::Router
+ oam_router_interface:
+ type: OS::Neutron::RouterInterface
properties:
- name:
- list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']]
- external_gateway_info:
- network: { get_param: public_net_id }
+ router_id: { get_resource: router }
+ subnet_id: { get_resource: oam_subnet }
- router_interface:
+ 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_subnet }
+ subnet_id: { get_resource: oam_ext_subnet }
rancher_private_port:
type: OS::Neutron::Port
diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index a00ffe63e..e9342a436 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 @@ parameters:
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 @@ resources:
- 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,19 +165,30 @@ resources:
cidr: { get_param: oam_network_cidr }
dns_nameservers: [ "8.8.8.8" ]
- router:
- type: OS::Neutron::Router
+ oam_router_interface:
+ type: OS::Neutron::RouterInterface
properties:
- name:
- list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']]
- external_gateway_info:
- network: { get_param: public_net_id }
+ router_id: { get_resource: router }
+ subnet_id: { get_resource: oam_subnet }
- router_interface:
+ 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_subnet }
+ subnet_id: { get_resource: oam_ext_subnet }
rancher_private_port:
type: OS::Neutron::Port