Revert "Add openstack-gateway label to control plane explicitly"

This reverts commit a94b21cff9fd23a6fe6450411890fce1c02e698a.

Reason for revert: PRODX-00000

Change-Id: I1846117ae7b0f595bbb778ec3a7444258d20d492
diff --git a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
index ea2b9b6..a649419 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
@@ -35,7 +35,7 @@
   private_floating_interface: 'enp3s0f1.403'
   storage_frontend_interface: 'enp3s0f1.404'
   storage_backend_interface: 'enp3s0f1.405'
-  worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-compute-node":"enabled","openvswitch":"enabled","openstack-gateway":"enabled","role":"ceph-osd-node"}}
+  worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-compute-node":"enabled","openvswitch":"enabled","role":"ceph-osd-node"}}
   cmp_metadata: {"labels": {"openstack-compute-node":"enabled","openvswitch":"enabled", "role":"ceph-osd-node"}}
   gtw_metadata: {"labels": {"openvswitch":"enabled"}}
   tunnel_interface: 'enp3s0f0'