From 4c29b26caf6eb65d341a56c6b50bd2765ecc8c43 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Wed, 19 Aug 2020 07:43:31 -0400
Subject: [PATCH] Fixed labeling for Neutron

Change-Id: I5918fe4ab07a9055f25fd8eb8eedbc0828410782
---
 openstack_operator/templates/neutron/daemonset.yml.j2       | 6 +++---
 openstack_operator/templates/neutron/rabbitmq.yml.j2        | 2 ++
 openstack_operator/templates/neutron/secret-rabbitmq.yml.j2 | 2 ++
 openstack_operator/templates/neutron/service.yml.j2         | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/openstack_operator/templates/neutron/daemonset.yml.j2 b/openstack_operator/templates/neutron/daemonset.yml.j2
index f6eecafb..140471ba 100644
--- a/openstack_operator/templates/neutron/daemonset.yml.j2
+++ b/openstack_operator/templates/neutron/daemonset.yml.j2
@@ -19,7 +19,7 @@ metadata:
   name: neutron
   namespace: openstack
   labels:
-    {{ labels("neutron") | indent(4) }}
+    {{ labels("neutron", component="server") | indent(4) }}
 spec:
   updateStrategy:
     rollingUpdate:
@@ -27,11 +27,11 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      {{ labels("neutron") | indent(6) }}
+      {{ labels("neutron", component="server") | indent(6) }}
   template:
     metadata:
       labels:
-        {{ labels("neutron") | indent(8) }}
+        {{ labels("neutron", component="server") | indent(8) }}
     spec:
       automountServiceAccountToken: false
       initContainers:
diff --git a/openstack_operator/templates/neutron/rabbitmq.yml.j2 b/openstack_operator/templates/neutron/rabbitmq.yml.j2
index 5f272053..e76dd52a 100644
--- a/openstack_operator/templates/neutron/rabbitmq.yml.j2
+++ b/openstack_operator/templates/neutron/rabbitmq.yml.j2
@@ -18,6 +18,8 @@ kind: Rabbitmq
 metadata:
   name: neutron
   namespace: openstack
+  labels:
+    {{ labels("neutron") | indent(4) }}
 spec:
   authSecret: neutron-rabbitmq
   nodeSelector:
diff --git a/openstack_operator/templates/neutron/secret-rabbitmq.yml.j2 b/openstack_operator/templates/neutron/secret-rabbitmq.yml.j2
index b24ea6fc..7df70b53 100644
--- a/openstack_operator/templates/neutron/secret-rabbitmq.yml.j2
+++ b/openstack_operator/templates/neutron/secret-rabbitmq.yml.j2
@@ -2,6 +2,8 @@ apiVersion: v1
 metadata:
   name: neutron-rabbitmq
   namespace: openstack
+  labels:
+    {{ labels("neutron") | indent(4) }}
 stringData:
   username: neutron
   password: {{ password }}
diff --git a/openstack_operator/templates/neutron/service.yml.j2 b/openstack_operator/templates/neutron/service.yml.j2
index 8967aece..633d7376 100644
--- a/openstack_operator/templates/neutron/service.yml.j2
+++ b/openstack_operator/templates/neutron/service.yml.j2
@@ -18,6 +18,8 @@ kind: Service
 metadata:
   name: neutron
   namespace: openstack
+  labels:
+    {{ labels("neutron", component="server") | indent(4) }}
 spec:
   ports:
   - name: neutron
@@ -25,4 +27,4 @@ spec:
     protocol: TCP
     targetPort: neutron
   selector:
-    {{ labels("neutron") | indent(4) }}
+    {{ labels("neutron", component="server") | indent(4) }}