Merge pull request #4649 from ewolinetz/bz1465718

Merged by openshift-bot

roles/openshift_logging_elasticsearch/tasks/main.yaml

@@ -173,9 +173,8 @@
     selector:
       component: "{{ es_component }}"
       provider: openshift
-    # pending #4091
-    #labels:
-    #- logging-infra: 'support'
+    labels:
+      logging-infra: 'support'
     ports:
     - port: 9300
 
@@ -187,9 +186,8 @@
     selector:
       component: "{{ es_component }}"
       provider: openshift
-    # pending #4091
-    #labels:
-    #- logging-infra: 'support'
+    labels:
+      logging-infra: 'support'
     ports:
     - port: 9200
       targetPort: "restapi"

roles/openshift_logging_kibana/tasks/main.yaml

@@ -89,9 +89,8 @@
     selector:
       component: "{{ kibana_component }}"
       provider: openshift
-    # pending #4091
-    #labels:
-    #- logging-infra: 'support'
+    labels:
+      logging-infra: 'support'
     ports:
     - port: 443
       targetPort: "oaproxy"