Преглед изворни кода

openshift_facts: ensure system containers deps are installed

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Giuseppe Scrivano пре 8 година
родитељ
комит
d5fd3d7e97
2 измењених фајлова са 14 додато и 0 уклоњено
  1. 9 0
      roles/openshift_facts/tasks/main.yml
  2. 5 0
      roles/openshift_facts/vars/main.yml

+ 9 - 0
roles/openshift_facts/tasks/main.yml

@@ -13,6 +13,8 @@
     l_is_node_system_container: "{{ (use_node_system_container | default(use_system_containers) | bool) }}"
     l_is_master_system_container: "{{ (use_master_system_container | default(use_system_containers) | bool) }}"
     l_is_etcd_system_container: "{{ (use_etcd_system_container | default(use_system_containers) | bool) }}"
+- set_fact:
+    l_any_system_container: "{{ l_is_etcd_system_container or l_is_openvswitch_system_container or l_is_node_system_container or l_is_master_system_container }}"
 
 - name: Validate python version
   fail:
@@ -50,6 +52,13 @@
   with_items: "{{ required_packages }}"
   when: not l_is_atomic | bool
 
+- name: Ensure various deps for running system containers are installed
+  package: name={{ item }} state=present
+  with_items: "{{ required_system_containers_packages }}"
+  when:
+  - not l_is_atomic | bool
+  - l_any_system_container | bool
+
 - name: Gather Cluster facts and set is_containerized if needed
   openshift_facts:
     role: common

+ 5 - 0
roles/openshift_facts/vars/main.yml

@@ -5,3 +5,8 @@ required_packages:
   - python-six
   - PyYAML
   - yum-utils
+
+required_system_containers_packages:
+  - atomic
+  - ostree
+  - runc