Add parameters with host routes
Added control_network_host_routes and tun_network_host_routes
parameters for control and tunnel networks to be able to
specify host routes for related subnets
Related-PROD: PRODX-14256
Change-Id: I60643558038d4ccfcde23d534134a2490993187f
diff --git a/de/heat-templates/fragments/NetworkAccVM.yaml b/de/heat-templates/fragments/NetworkAccVM.yaml
index 7ec1a14..d0eddc5 100644
--- a/de/heat-templates/fragments/NetworkAccVM.yaml
+++ b/de/heat-templates/fragments/NetworkAccVM.yaml
@@ -8,6 +8,9 @@
dns_nameservers:
type: json
default: []
+ control_network_host_routes:
+ type: json
+ default: []
resources:
@@ -20,6 +23,7 @@
enable_dhcp: true
cidr: { get_param: control_network_cidr }
dns_nameservers: { get_param: dns_nameservers }
+ host_routes: { get_param: control_network_host_routes }
router:
type: OS::Neutron::Router
properties:
diff --git a/de/heat-templates/fragments/NetworkTun.yaml b/de/heat-templates/fragments/NetworkTun.yaml
index 0b122ac..3595cc7 100644
--- a/de/heat-templates/fragments/NetworkTun.yaml
+++ b/de/heat-templates/fragments/NetworkTun.yaml
@@ -7,6 +7,9 @@
type: string
tun_network_pool_end:
type: string
+ tun_network_host_routes:
+ type: json
+ default: []
resources:
@@ -22,6 +25,7 @@
allocation_pools:
- start: { get_param: tun_network_pool_start }
end: { get_param: tun_network_pool_end }
+ host_routes: { get_param: tun_network_host_routes }
outputs:
tun_network_id:
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index e829a9f..c61f959 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -17,6 +17,13 @@
type: string
description: The CIDR of control network, used to detect control interface.
default: '10.10.0.0/24'
+ control_network_host_routes:
+ type: json
+ description: >
+ List of dicts with host routes in control subnet, e.g:
+ - "destination": "10.100.100.1/32"
+ "nexthop": "172.16.1.1"
+ default: []
control_network_vsrx_peering_ip:
type: string
description: IP address of vsrx for tungsten fabric peering
@@ -177,6 +184,13 @@
tun_network_pool_end:
type: string
default: '10.15.0.99'
+ tun_network_host_routes:
+ type: json
+ description: >
+ List of dicts with host routes in tunnel subnet, e.g:
+ - "destination": "10.100.100.1/32"
+ "nexthop": "172.16.1.1"
+ default: []
ucp_metadata:
type: json
default: {"role":"ucp"}
@@ -339,6 +353,7 @@
public_net_id: { get_param: public_net_id }
control_network_cidr: { get_param: control_network_cidr }
dns_nameservers: { get_param: dns_nameservers }
+ control_network_host_routes: { get_param: control_network_host_routes }
tun_network:
type: MCP2::NetworkTun
@@ -346,6 +361,7 @@
tun_network_cidr: { get_param: tun_network_cidr }
tun_network_pool_start: { get_param: tun_network_pool_start }
tun_network_pool_end: { get_param: tun_network_pool_end }
+ tun_network_host_routes: { get_param: tun_network_host_routes }
private_floating_network:
type: MCP2::NetworkPrvFl