diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 10:52:55 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 14:48:01 -0500 |
| commit | 74026a867051d6909db02bab4140d663b26b7968 (patch) | |
| tree | 952eb8ff42c521ac683cecac112dbdac9a006fd5 | |
| parent | 1589b11e1a5b7819c092c44a7b313b3eec666b6f (diff) | |
| download | openshift-74026a867051d6909db02bab4140d663b26b7968.tar.gz openshift-74026a867051d6909db02bab4140d663b26b7968.tar.bz2 openshift-74026a867051d6909db02bab4140d663b26b7968.tar.xz openshift-74026a867051d6909db02bab4140d663b26b7968.zip | |
reverting back to pre-pulling the master image
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index e9d7f4afe..3b224416e 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/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: diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 4f722679d..15b3c320c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/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" diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index b87c2aa21..e250afe09 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/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 |