summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-07-24 15:12:00 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-07-24 15:17:33 -0400
commit9692654b0d87605bf45194128dc509cf71eee31f (patch)
tree170db11933fb7217fc5dc95d0a6159cc092c40b0
parent0883acb3dcd842a14089150b14760b02173edf72 (diff)
downloadopenshift-9692654b0d87605bf45194128dc509cf71eee31f.tar.gz
openshift-9692654b0d87605bf45194128dc509cf71eee31f.tar.bz2
openshift-9692654b0d87605bf45194128dc509cf71eee31f.tar.xz
openshift-9692654b0d87605bf45194128dc509cf71eee31f.zip
Normalize logging entry.
-rw-r--r--playbooks/byo/openshift-cluster/config.yml4
-rw-r--r--playbooks/common/openshift-cluster/config.yml4
-rw-r--r--playbooks/common/openshift-cluster/openshift_logging.yml2
3 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml
index acf5469bf..c0978c6f6 100644
--- 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
index 7224ae712..867e6b3d6 100644
--- 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
index 57580406c..c5f0c406a 100644
--- a/playbooks/common/openshift-cluster/openshift_logging.yml
+++ b/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