Merge pull request #4850 from kwoodson/normalize_logging_entry

Normalize logging entry point to include std_include.

playbooks/byo/openshift-cluster/config.yml

@@ -3,10 +3,6 @@
   tags:
   - always
 
-- include: ../../common/openshift-cluster/std_include.yml
-  tags:
-  - always
-
 - include: ../../common/openshift-cluster/config.yml
   vars:
     openshift_cluster_id: "{{ cluster_id | default('default') }}"

playbooks/common/openshift-cluster/config.yml

@@ -1,4 +1,8 @@
 ---
+- include: std_include.yml
+  tags:
+  - always
+
 # TODO: refactor this into its own include
 # and pass a variable for ctx
 - name: Verify Requirements

playbooks/common/openshift-cluster/openshift_logging.yml

@@ -1,5 +1,5 @@
 ---
-- include: evaluate_groups.yml
+- include: std_include.yml
 
 - name: OpenShift Aggregated Logging
   hosts: oo_first_master