diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-02 16:31:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 16:31:41 -0500 |
| commit | d045a07f4929cf8722844577e2c73a544c189c64 (patch) | |
| tree | c431a9cbb0892f0ed5fcc2b25685a9714e9a8a41 /playbooks/byo | |
| parent | 18eb563108c8c49c2ebbcf13a310bbc1050d2d9f (diff) | |
| parent | 93b380ec368767acde884e4844439e6ad5ae5e98 (diff) | |
| download | openshift-d045a07f4929cf8722844577e2c73a544c189c64.tar.gz openshift-d045a07f4929cf8722844577e2c73a544c189c64.tar.bz2 openshift-d045a07f4929cf8722844577e2c73a544c189c64.tar.xz openshift-d045a07f4929cf8722844577e2c73a544c189c64.zip | |
Merge pull request #4045 from kwoodson/normalize_groups
Merged by openshift-bot
Diffstat (limited to 'playbooks/byo')
| -rw-r--r-- | playbooks/byo/openshift-cluster/initialize_groups.yml | 14 | ||||
| -rw-r--r-- | playbooks/byo/openshift-preflight/check.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift_facts.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/rhel_subscribe.yml | 2 |
4 files changed, 5 insertions, 17 deletions
diff --git a/playbooks/byo/openshift-cluster/initialize_groups.yml b/playbooks/byo/openshift-cluster/initialize_groups.yml index 2785dcc3b..2a725510a 100644 --- a/playbooks/byo/openshift-cluster/initialize_groups.yml +++ b/playbooks/byo/openshift-cluster/initialize_groups.yml @@ -8,17 +8,3 @@ - always tasks: - include_vars: cluster_hosts.yml - - name: Evaluate group l_oo_all_hosts - add_host: - name: "{{ item }}" - groups: l_oo_all_hosts - with_items: "{{ g_all_hosts | default([]) }}" - changed_when: no - -- name: Create initial host groups for all hosts - hosts: l_oo_all_hosts - gather_facts: no - tags: - - always - tasks: - - include_vars: cluster_hosts.yml diff --git a/playbooks/byo/openshift-preflight/check.yml b/playbooks/byo/openshift-preflight/check.yml index c5f05d0f0..04a55308a 100644 --- a/playbooks/byo/openshift-preflight/check.yml +++ b/playbooks/byo/openshift-preflight/check.yml @@ -1,5 +1,7 @@ --- -- hosts: OSEv3 +- include: ../openshift-cluster/initialize_groups.yml + +- hosts: g_all_hosts name: run OpenShift health checks roles: - openshift_health_checker diff --git a/playbooks/byo/openshift_facts.yml b/playbooks/byo/openshift_facts.yml index 3b10323d6..75b606e61 100644 --- a/playbooks/byo/openshift_facts.yml +++ b/playbooks/byo/openshift_facts.yml @@ -8,7 +8,7 @@ - always - name: Gather Cluster facts - hosts: OSEv3 + hosts: g_all_hosts roles: - openshift_facts tasks: diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml index b2a062bbe..aec87cf82 100644 --- a/playbooks/byo/rhel_subscribe.yml +++ b/playbooks/byo/rhel_subscribe.yml @@ -4,7 +4,7 @@ - always - name: Subscribe hosts, update repos and update OS packages - hosts: l_oo_all_hosts + hosts: g_all_hosts roles: - role: rhel_subscribe when: deployment_type in ['atomic-enterprise', 'enterprise', 'openshift-enterprise'] and |