diff options
Diffstat (limited to 'deployment/heat/onap-rke/parts/onap-oom-1.yaml')
| -rw-r--r-- | deployment/heat/onap-rke/parts/onap-oom-1.yaml | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml index 886e1be6a..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 @@ -74,7 +78,7 @@ parameters: helm_version: type: string - default: "2.12.5" + default: "2.12.3" helm_deploy_delay: type: string @@ -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 |