diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-15 23:48:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 23:48:48 -0400 |
| commit | f042257e22053d0ac47f3e532e749d4fce75d9b5 (patch) | |
| tree | 8c84405373b5b08b6676a5c61effdbe631323654 | |
| parent | 8da216496dc39f1bd9340387af199eb404099edf (diff) | |
| parent | 770e1700dfad94c5be8a673099579aab29457bea (diff) | |
| download | openshift-f042257e22053d0ac47f3e532e749d4fce75d9b5.tar.gz openshift-f042257e22053d0ac47f3e532e749d4fce75d9b5.tar.bz2 openshift-f042257e22053d0ac47f3e532e749d4fce75d9b5.tar.xz openshift-f042257e22053d0ac47f3e532e749d4fce75d9b5.zip | |
Merge pull request #5091 from mtnbikenc/standardize-std_include
Merged by openshift-bot
4 files changed, 10 insertions, 6 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index c0978c6f6..acf5469bf 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/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') }}" diff --git a/playbooks/byo/openshift-cluster/openshift-logging.yml b/playbooks/byo/openshift-cluster/openshift-logging.yml index 76f165c6d..bbec3a4c2 100644 --- a/playbooks/byo/openshift-cluster/openshift-logging.yml +++ b/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: diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 5d5497acb..e1df71112 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/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 diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml index c5f0c406a..c1a5d83cd 100644 --- a/playbooks/common/openshift-cluster/openshift_logging.yml +++ b/playbooks/common/openshift-cluster/openshift_logging.yml @@ -1,6 +1,4 @@ --- -- include: std_include.yml - - name: OpenShift Aggregated Logging hosts: oo_first_master roles: |