Merge pull request #7238 from jcantrill/fix_when_to_annotate

Automatic merge from submit-queue.

only annotate ops project for ops kibana when using ops

This PR:

* fixes the case where we should only annotate ops projects for the ops kibana when ops is enabled

roles/openshift_logging/tasks/annotate_ops_projects.yaml

@@ -5,17 +5,29 @@
     get namespaces -o jsonpath={.items[*].metadata.name} {{ __default_logging_ops_projects | join(' ') }}
   register: __logging_ops_projects
 
-- name: Annotate Operations Projects
+- name: Annotate Operations Projects for hostname
   oc_edit:
     kind: ns
     name: "{{ project }}"
     separator: '#'
     content:
       metadata#annotations#openshift.io/logging.ui.hostname: "{{ openshift_logging_kibana_ops_hostname }}"
-      metadata#annotations#openshift.io/logging.data.prefix: ".operations"
   with_items: "{{ __logging_ops_projects.stdout.split(' ') }}"
   loop_control:
     loop_var: project
   when:
   - __logging_ops_projects.stderr | length == 0
   - openshift_logging_use_ops | default(false) | bool
+
+- name: Annotate Operations Projects for data prefix
+  oc_edit:
+    kind: ns
+    name: "{{ project }}"
+    separator: '#'
+    content:
+      metadata#annotations#openshift.io/logging.data.prefix: ".operations"
+  with_items: "{{ __logging_ops_projects.stdout.split(' ') }}"
+  loop_control:
+    loop_var: project
+  when:
+  - __logging_ops_projects.stderr | length == 0