Merge "Add openstack-frrouting:enabled label to controllers"
diff --git a/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml b/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml
index 778dd6d..da3b74f 100644
--- a/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml
+++ b/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml
@@ -29,7 +29,8 @@
private_floating_network_pool_end: '10.13.127.255'
ironic_baremetal_network_cidr: '10.14.0.0/24'
ironic_baremetal_network_ipam_pool_start: '10.14.0.2'
- ironic_baremetal_network_ipam_pool_end: '10.14.0.99'
+ ironic_baremetal_network_ipam_pool_end: '10.14.0.98'
+ ironic_baremetal_network_gateway: '10.14.0.99'
ironic_baremetal_network_pool_start: '10.14.0.100'
ironic_baremetal_network_pool_end: '10.14.0.200'
control_network_cidr: '10.9.10.0/24'
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0-vbmc5.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0-vbmc5.yaml
index cf19187..70b57bd 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0-vbmc5.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0-vbmc5.yaml
@@ -27,6 +27,15 @@
cmp_metadata: {"labels": {"openstack-compute-node":"enabled","openvswitch":"enabled", "role":"ceph-osd-node"}}
gtw_metadata: {"labels": {"openvswitch":"enabled"}}
vbmc_metadata: {"labels": {"virtualbmc":"enabled"}}
+ ironic_baremetal_network_cidr: '10.13.0.0/24'
+ ironic_baremetal_network_ipam_pool_start: '10.13.0.2'
+ ironic_baremetal_network_ipam_pool_end: '10.13.0.98'
+ ironic_baremetal_network_pool_start: '10.13.0.100'
+ ironic_baremetal_network_pool_end: '10.13.0.200'
+ # By default on ci ironic network is set up as internal
+ # with default gateway set to 10.13.0.99, in order to
+ # tempest can have connectivity to bm vms via floating ips
+ ironic_baremetal_network_gateway: '10.13.0.99'
# hardware_metadata which is used for Ceph requires flavor with
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 51e82aa..d80307a 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -903,6 +903,8 @@
value: { get_param: ironic_baremetal_network_pool_start }
ironic_baremetal_network_pool_end:
value: { get_param: ironic_baremetal_network_pool_end }
+ ironic_baremetal_network_gateway:
+ value: { get_param: ironic_baremetal_network_gateway }
ironic_baremetal_network_interface:
value: { get_param: ironic_baremetal_network_interface }
ironic_baremetal_network_vbmc_interface: