Browse Source

reverting back to pre-pulling the master image

Brenton Leanhardt 9 years ago
parent
commit
74026a8670

+ 5 - 0
roles/openshift_cli/tasks/main.yml

@@ -8,6 +8,11 @@
 - name: Install clients
   action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-clients state=present"
   when: not openshift.common.is_containerized | bool
+
+- name: Pull CLI Image
+  command: >
+    docker pull {{ openshift.common.cli_image }}:{{ openshift_version }}
+  when: openshift.common.is_containerized | bool
   
 - name: Create /usr/local/bin/openshift cli wrapper
   template:

+ 5 - 0
roles/openshift_master/tasks/main.yml

@@ -92,6 +92,11 @@
   action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_version  }} state=present"
   when: not openshift.common.is_containerized | bool
 
+- name: Pull master image
+  command: >
+    docker pull {{ openshift.master.master_image }}:{{ openshift_version }}
+  when: openshift.common.is_containerized | bool
+
 - name: Install Master docker service file
   template:
     dest: "/etc/systemd/system/{{ openshift.common.service_type }}-master.service"

+ 2 - 2
roles/openshift_node/tasks/main.yml

@@ -47,12 +47,12 @@
 
 - name: Pull node image
   command: >
-    docker pull {{ openshift.node.node_image }}
+    docker pull {{ openshift.node.node_image }}:{{ openshift_version }}
   when: openshift.common.is_containerized | bool
 
 - name: Pull OpenVSwitch image
   command: >
-    docker pull {{ openshift.node.ovs_image }}
+    docker pull {{ openshift.node.ovs_image }}:{{ openshift_version }}
   when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool
 
 - name: Install Node docker service file