Ver Fonte

Move installation of packages before container_runtime to ensure bind mounts are avaialable.

Kenny Woodson há 7 anos atrás
pai
commit
cf298e1e9a

+ 1 - 1
roles/openshift_node/defaults/main.yml

@@ -112,7 +112,7 @@ l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_contain
 openshift_image_tag: ''
 
 default_r_openshift_node_image_prep_packages:
-#- "{{ openshift_service_type }}-master"
+- "{{ openshift_service_type }}-master"
 - "{{ openshift_service_type }}-node"
 - "{{ openshift_service_type }}-docker-excluder"
 - "{{ openshift_service_type }}-sdn-ovs"

+ 3 - 7
roles/openshift_node/tasks/bootstrap.yml

@@ -1,11 +1,7 @@
 ---
-- name: install needed rpm(s)
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ r_openshift_node_image_prep_packages }}"
-  register: result
-  until: result is succeeded
+- name: include package installs
+  import_tasks: install_rpms.yml
+  when: not (openshift_is_atomic | default(False) | bool)
 
 - name: create the directory for node
   file:

+ 9 - 0
roles/openshift_node/tasks/install_rpms.yml

@@ -0,0 +1,9 @@
+---
+- name: install needed rpm(s)
+  package:
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ r_openshift_node_image_prep_packages }}"
+  register: result
+  until: result is succeeded
+  when: not (openshift_is_atomic | default(False) | bool)