diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-02 10:04:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 10:04:14 -0400 |
| commit | db716923b320ec531d632727af4d7cb3a3123a5d (patch) | |
| tree | 3841c8fe611ce686e3c0e4e712f1f3c0fdd1e770 | |
| parent | 165e1ebe2a9ce0d77e96b8a0d09a95e85e2bd363 (diff) | |
| parent | 9692654b0d87605bf45194128dc509cf71eee31f (diff) | |
| download | openshift-db716923b320ec531d632727af4d7cb3a3123a5d.tar.gz openshift-db716923b320ec531d632727af4d7cb3a3123a5d.tar.bz2 openshift-db716923b320ec531d632727af4d7cb3a3123a5d.tar.xz openshift-db716923b320ec531d632727af4d7cb3a3123a5d.zip | |
Merge pull request #4850 from kwoodson/normalize_logging_entry
Normalize logging entry point to include std_include.
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_logging.yml | 2 |
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 31c4b04af..7136f1c1f 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 |