Merge pull request #8172 from vrutkovs/prepull-images

Pre-pull images before starting API and controller

playbooks/init/base_packages.yml

@@ -39,6 +39,7 @@
       - "{{ 'python-ipaddress' if ansible_distribution != 'Fedora' else '' }}"
       - libsemanage-python
       - yum-utils
+      - "{{ 'python3-docker' if ansible_distribution == 'Fedora' else 'python-docker' }}"
       when: item != ''
       register: result
       until: result is succeeded

roles/openshift_control_plane/tasks/main.yml

@@ -10,6 +10,22 @@
   when:
   - openshift_master_oauth_grant_method not in openshift_master_valid_grant_methods
 
+- name: Check that origin image is present
+  command: 'docker images -q "{{ osm_image }}"'
+  register: control_plane_image
+
+# This task runs async to save time while the master is being configured
+- name: Pre-pull Origin image
+  docker_image:
+    name: "{{ osm_image }}"
+  environment:
+    NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
+  when: control_plane_image.stdout_lines == []
+  # 10 minutes to pull the image
+  async: 600
+  poll: 10
+  register: image_prepull
+
 - name: Open up firewall ports
   import_tasks: firewall.yml
 
@@ -129,6 +145,14 @@
   # copy to this location to bypass initial bootstrap request
   - /etc/origin/node/node.kubeconfig
 
+- name: Check status of control plane image pre-pull
+  async_status:
+    jid: "{{ image_prepull.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  when: control_plane_image.stdout_lines == []
+  retries: 30
+
 - name: Start and enable self-hosting node
   systemd:
     name: "{{ openshift_service_type }}-node"

roles/openshift_node/defaults/main.yml

@@ -10,6 +10,9 @@ openshift_node_proxy_mode: iptables
 openshift_set_node_ip: False
 openshift_config_base: '/etc/origin'
 
+
+# Assume the images are already downloaded on the machine
+system_images_registry: "docker"
 l_osn_image: "{{ (system_images_registry == 'docker') | ternary(osn_image, (osn_image.split('/')|length==2) | ternary(system_images_registry + '/' + osn_image, osn_image)) }}"
 system_osn_image: "{{ (system_images_registry == 'docker') | ternary('docker:' + l_osn_image, l_osn_image) }}"
 

roles/openshift_node/tasks/config.yml

@@ -1,4 +1,20 @@
 ---
+- name: Check that node image is present
+  command: 'docker images -q "{{ osn_image }}"'
+  register: node_image
+
+# This task runs async to save time while the node is being configured
+- name: Pre-pull node image
+  docker_image:
+    name: "{{ osn_image }}"
+  environment:
+    NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
+  when: node_image.stdout_lines == []
+  # 10 minutes to pull the image
+  async: 600
+  poll: 10
+  register: image_prepull
+
 - name: Install the systemd units
   import_tasks: systemd_units.yml
 
@@ -34,3 +50,13 @@
 - name: include aws provider credentials
   import_tasks: aws.yml
   when: not (openshift_node_use_instance_profiles | default(False))
+
+- name: Check status of node image pre-pull
+  async_status:
+    jid: "{{ image_prepull.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  when:
+  - node_image.stdout_lines == []
+  - not openshift_is_atomic | bool
+  retries: 30

roles/openshift_node/tasks/node_system_container.yml

@@ -16,9 +16,19 @@
   - "/var/lib/kubelet"
   - "/opt/cni/bin"
 
-- name: Pre-pull node system container image
+- name: Check status of node image pre-pull
+  async_status:
+    jid: "{{ image_prepull.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  when:
+  - node_image is defined
+  - node_image.stdout_lines == []
+  retries: 30
+
+- name: Copy node container image to ostree storage
   command: >
-    atomic pull --storage=ostree {{ system_osn_image }}
+    atomic pull --storage=ostree docker:{{ osn_image }}
   register: pull_result
   retries: 3
   delay: 5