Merge pull request #5091 from mtnbikenc/standardize-std_include

Merged by openshift-bot

playbooks/byo/openshift-cluster/config.yml

@@ -3,6 +3,10 @@
   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/byo/openshift-cluster/openshift-logging.yml

@@ -5,6 +5,12 @@
 # currently supported method.
 #
 - include: initialize_groups.yml
+  tags:
+  - always
+
+- include: ../../common/openshift-cluster/std_include.yml
+  tags:
+  - always
 
 - include: ../../common/openshift-cluster/openshift_logging.yml
   vars:

playbooks/common/openshift-cluster/config.yml

@@ -1,8 +1,4 @@
 ---
-- 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,6 +1,4 @@
 ---
-- include: std_include.yml
-
 - name: OpenShift Aggregated Logging
   hosts: oo_first_master
   roles: