Switch openstack-gateway labels to cmp nodes
Related-Prod: PRODX-30042
Change-Id: I51ccd3302f5d3afc4d312f9a71021ea340eb15b3
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
index 1fb92b7..d894a83 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
@@ -33,9 +33,9 @@
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
- acmp_metadata: {"labels": {"openstack-compute-node":"enabled","openstack-compute-node-dpdk":"enabled","tfvrouter-dpdk":"enabled"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
+ acmp_metadata: {"labels": {"openstack-compute-node":"enabled","openstack-compute-node-dpdk":"enabled","tfvrouter-dpdk":"enabled","openstack-gateway": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
# hardware_metadata which is used for Ceph requires flavor with
# ephemeral storage because it is used for Ceph bluestore.
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
index 25c2964..6bfd22a 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
@@ -33,8 +33,8 @@
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
lma_metadata: {"labels": {"role": "stacklight", "stacklight": "enabled","local-volume-provisioner": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
# hardware_metadata which is used for Ceph requires flavor with
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
index 5475a7d..0d35d73 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
@@ -33,8 +33,8 @@
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
vbmc_metadata: {"labels": {"virtualbmc":"enabled"}}
ironic_baremetal_network_cidr: '10.13.0.0/24'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml
index 5a7c5c4..62f54cd 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml
@@ -46,8 +46,8 @@
evpn_network_vmx_ip: '10.20.100.100'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
# hardware_metadata which is used for Ceph requires flavor with
# ephemeral storage because it is used for Ceph bluestore.
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
index d72b7f0..a8eeca9 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
@@ -32,8 +32,8 @@
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
# hardware_metadata which is used for Ceph requires flavor with
# ephemeral storage because it is used for Ceph bluestore.
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
index 2c42555..bd74bad 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
@@ -32,8 +32,8 @@
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
# hardware_metadata which is used for Ceph requires flavor with
# ephemeral storage because it is used for Ceph bluestore.
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
index 158071d..1271269 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
@@ -32,8 +32,8 @@
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
tunnel_interface: 'ens8'
- worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-gateway": "enabled","local-volume-provisioner": "enabled"}}
- cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node"}}
+ worker_metadata: {"labels": {"openstack-control-plane":"enabled","local-volume-provisioner": "enabled"}}
+ cmp_metadata: {"labels": {"openstack-compute-node":"enabled","tfvrouter":"enabled", "role":"ceph-osd-node","openstack-gateway": "enabled"}}
ntw_metadata: {"labels": {"tfconfig":"enabled","tfconfigdb":"enabled","tfcontrol":"enabled","tfanalytics":"enabled","tfanalyticsdb":"enabled","tfwebui":"enabled","local-volume-provisioner": "enabled"}}
# hardware_metadata which is used for Ceph requires flavor with
# ephemeral storage because it is used for Ceph bluestore.