From 2249ba3d08d1e6c55bf008609c9e4eace16bd917 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 5 Dec 2017 15:14:49 -0500
Subject: Implement container_runtime playbooks and changes

This commit refactors some duplicate code, removes
usage of set_fact where not needed, and reorganizes
container_runtime role to use include_role.
---
 playbooks/container-runtime/config.yml         |  6 ++++++
 playbooks/container-runtime/private/config.yml | 28 ++++++++++++++++++++++++++
 playbooks/container-runtime/private/roles      |  1 +
 playbooks/prerequisites.yml                    | 10 ++-------
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 playbooks/container-runtime/config.yml
 create mode 100644 playbooks/container-runtime/private/config.yml
 create mode 120000 playbooks/container-runtime/private/roles

(limited to 'playbooks')

diff --git a/playbooks/container-runtime/config.yml b/playbooks/container-runtime/config.yml
new file mode 100644
index 000000000..f15aa771f
--- /dev/null
+++ b/playbooks/container-runtime/config.yml
@@ -0,0 +1,6 @@
+---
+- import_playbook: ../init/main.yml
+  vars:
+    skip_verison: True
+
+- import_playbook: private/config.yml
diff --git a/playbooks/container-runtime/private/config.yml b/playbooks/container-runtime/private/config.yml
new file mode 100644
index 000000000..67445edeb
--- /dev/null
+++ b/playbooks/container-runtime/private/config.yml
@@ -0,0 +1,28 @@
+---
+- hosts: "{{ l_containerized_host_groups }}"
+  vars:
+    l_chg_temp: "{{ 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.
+  roles:
+    - role: container_runtime
+  tasks:
+    - include_role:
+        name: container_runtime
+        tasks_from: package_docker.yml
+      when:
+        - not openshift_docker_use_system_container | bool
+        - not openshift_use_crio_only | bool
+    - include_role:
+        name: container_runtime
+        tasks_from: systemcontainer_docker.yml
+      when:
+        - openshift_docker_use_system_container | bool
+        - not openshift_use_crio_only | bool
+    - include_role:
+        name: container_runtime
+        tasks_from: systemcontainer_crio.yml
+      when:
+        - openshift_use_crio | bool
+        - openshift_docker_is_node_or_master | bool
diff --git a/playbooks/container-runtime/private/roles b/playbooks/container-runtime/private/roles
new file mode 120000
index 000000000..148b13206
--- /dev/null
+++ b/playbooks/container-runtime/private/roles
@@ -0,0 +1 @@
+../../roles/
\ No newline at end of file
diff --git a/playbooks/prerequisites.yml b/playbooks/prerequisites.yml
index 7dd59c5d8..0cc5fcef8 100644
--- a/playbooks/prerequisites.yml
+++ b/playbooks/prerequisites.yml
@@ -1,12 +1,6 @@
 ---
-- include: init/main.yml
+- import_playbook: init/main.yml
   vars:
     skip_verison: True
 
-- hosts: "{{ l_containerized_host_groups }}"
-  vars:
-    l_chg_temp: "{{ openshift_containerized_host_groups | default([]) }}"
-    l_containerized_host_groups: "{{ (['oo_nodes_to_config'] | union(l_chg_temp)) | join(':') }}"
-  tasks:
-    - include_role:
-        name: container_runtime
+- import_playbook: container-runtime/private/config.yml
-- 
cgit v1.2.3