Normalizing groups.

7 files changed, 9 insertions, 20 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 777743def..8091d5700 100644
--- a/playbooks/byo/rhel_subscribe.yml
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -8,7 +8,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
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index 07b38920f..4b0efa182 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -1,13 +1,14 @@
 ---
 # NOTE: requires openshift_facts be run
 - name: Verify compatible yum/subscription-manager combination
-  hosts: l_oo_all_hosts
+  hosts: oo_all_hosts
   gather_facts: no
   tasks:
   # See:
   #   https://bugzilla.redhat.com/show_bug.cgi?id=1395047
   #   https://bugzilla.redhat.com/show_bug.cgi?id=1282961
   #   https://github.com/openshift/openshift-ansible/issues/1138
+  #   Consider the repoquery module for this work
   - name: Check for bad combinations of yum and subscription-manager
     command: >
       {{ repoquery_cmd }} --installed --qf '%{version}' "yum"
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index 92f16dc47..ab0045a39 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -51,7 +51,7 @@
     changed_when: false
 
 - name: Configure docker hosts
-  hosts: oo_masters_to-config:oo_nodes_to_config
+  hosts: oo_masters_to_config:oo_nodes_to_config
   vars:
     docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split }}"
     docker_insecure_registries: "{{ lookup('oo_option',  'docker_insecure_registries') | oo_split }}"
diff --git a/playbooks/common/openshift-node/network_manager.yml b/playbooks/common/openshift-node/network_manager.yml
index be050c12c..0014a5dbd 100644
--- a/playbooks/common/openshift-node/network_manager.yml
+++ b/playbooks/common/openshift-node/network_manager.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install and configure NetworkManager
-  hosts: l_oo_all_hosts
+  hosts: oo_all_hosts
   become: yes
   tasks:
   - name: install NetworkManager