Merge pull request #6651 from mgugino-upstream-stage/containerized-groups

Build containerized host group dynamically

playbooks/container-runtime/private/build_container_groups.yml

@@ -0,0 +1,6 @@
+---
+- name: create oo_hosts_containerized_managed_true host group
+  hosts: oo_all_hosts:!oo_nodes_to_config
+  tasks:
+  - group_by:
+      key: oo_hosts_containerized_managed_{{ (containerized | default(False)) | ternary('true','false') }}

playbooks/container-runtime/private/config.yml

@@ -1,10 +1,7 @@
 ---
-- hosts: "{{ l_containerized_host_groups }}"
-  vars:
-    l_chg_temp: "{{ hostvars[groups['oo_first_master'][0]]['openshift_containerized_host_groups'] | default([]) }}"
-    l_containerized_host_groups: "{{ (['oo_nodes_to_config'] | union(l_chg_temp)) | join(':') }}"
-  # role: container_runtime is necessary  here to bring role default variables
-  # into the play scope.
+- import_playbook: build_container_groups.yml
+
+- hosts: oo_nodes_to_config:oo_hosts_containerized_managed_true
   roles:
     - role: container_runtime
   tasks:

playbooks/container-runtime/private/setup_storage.yml

@@ -1,5 +1,7 @@
 ---
-- hosts: "{{ l_containerized_host_groups }}"
+- import_playbook: build_container_groups.yml
+
+- hosts: oo_nodes_to_config:oo_hosts_containerized_managed_true
   vars:
     l_chg_temp: "{{ hostvars[groups['oo_first_master'][0]]['openshift_containerized_host_groups'] | default([]) }}"
     l_containerized_host_groups: "{{ (['oo_nodes_to_config'] | union(l_chg_temp)) | join(':') }}"

test/tox-inventory.txt

@@ -13,6 +13,7 @@ oo_first_etcd
 oo_etcd_hosts_to_backup
 oo_etcd_hosts_to_upgrade
 oo_etcd_to_migrate
+oo_hosts_containerized_managed_true
 oo_masters
 oo_masters_to_config
 oo_first_master
@@ -103,3 +104,6 @@ localhost
 
 [glusterfs_registry]
 localhost
+
+[oo_hosts_containerized_managed_true]
+localhost