From 3ae0f1cd4e518a6c59542e17480a925ecfe30a08 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 24 Jul 2017 15:12:00 -0400 Subject: [PATCH] Normalize logging entry. --- playbooks/byo/openshift-cluster/config.yml | 4 ---- playbooks/common/openshift-cluster/config.yml | 4 ++++ playbooks/common/openshift-cluster/openshift_logging.yml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index acf5469bf1a..c0978c6f640 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 7224ae712df..867e6b3d608 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 57580406c1f..8a2957af86e 100644 --- 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: