Normalize logging entry.

openshift · Jul 24, 2017 · 3ae0f1c · 3ae0f1c
1 parent 0883acb
commit 3ae0f1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/playbooks/byo/openshift-cluster/config.yml b/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') }}"

diff --git a/playbooks/common/openshift-cluster/config.yml b/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

diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml
@@ -1,6 +1,8 @@
 ---
 - include: evaluate_groups.yml
 
+- include: std_include.yml
+
 - name: OpenShift Aggregated Logging
   hosts: oo_first_master
   roles:
-Original file line number
+Diff line change
@@ Expand Up / @@ -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') }}"
@@ Expand Down @@