Created
June 3, 2019 13:09
-
-
Save eriknelson/8a596015c9a404a4c277dc1b23b1565f to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ansible/roles/openshift_setup/tasks/main.yml b/ansible/roles/openshift_setup/tasks/main.yml | |
index 0b28c4c..a957a55 100644 | |
--- a/ansible/roles/openshift_setup/tasks/main.yml | |
+++ b/ansible/roles/openshift_setup/tasks/main.yml | |
@@ -153,64 +153,64 @@ | |
become: 'true' | |
when: ansible_os_family == "RedHat" | |
- - name: Pull docker images for all openshift versions | |
- docker_image: | |
- name: "{{ item.img }}" | |
- state: present | |
- force: yes | |
- tag: "{{ item.tag }}" | |
- with_items: | |
- - "{{ openshift_setup_docker_images.group1 }}" | |
- | |
- - name: Pull additional docker images for 3.9+ | |
- docker_image: | |
- name: "{{ item.img }}" | |
- state: present | |
- force: yes | |
- tag: "{{ item.tag }}" | |
- with_items: | |
- - "{{ openshift_setup_docker_images.group2 }}" | |
- when: (openshift_setup_image_tag == "latest") or | |
- ("v3.9" in openshift_setup_image_tag) or | |
- ("v3.10" in openshift_setup_image_tag) or | |
- ("v3.11" in openshift_setup_image_tag) | |
- | |
- - name: Pull additional docker images for 3.10+ | |
- docker_image: | |
- name: "{{ item.img }}" | |
- state: present | |
- force: yes | |
- tag: "{{ item.tag }}" | |
- with_items: | |
- - "{{ openshift_setup_docker_images.group3 }}" | |
- when: (openshift_setup_image_tag == "latest") or | |
- ("v3.10" in openshift_setup_image_tag) or | |
- ("v3.11" in openshift_setup_image_tag) | |
- | |
- - name: Pull additional docker images for 3.11+ | |
- docker_image: | |
- name: "{{ item.img }}" | |
- state: present | |
- force: yes | |
- tag: "{{ item.tag }}" | |
- with_items: | |
- - "{{ openshift_setup_docker_images.group4 }}" | |
- when: | |
- - not("v3.7" in openshift_setup_image_tag) | |
- - not("v3.9" in openshift_setup_image_tag) | |
- - not("v3.10" in openshift_setup_image_tag) | |
- | |
- - name: Pull images for all versions except v3.11+ | |
- docker_image: | |
- name: "{{ item.img }}" | |
- state: present | |
- force: yes | |
- tag: "{{ item.tag }}" | |
- with_items: | |
- - "{{ openshift_setup_docker_images.group5 }}" | |
- when: ("v3.7" in openshift_setup_image_tag) or | |
- ("v3.9" in openshift_setup_image_tag) or | |
- ("v3.10" in openshift_setup_image_tag) | |
+ #- name: Pull docker images for all openshift versions | |
+ #docker_image: | |
+ #name: "{{ item.img }}" | |
+ #state: present | |
+ #force: yes | |
+ #tag: "{{ item.tag }}" | |
+ #with_items: | |
+ #- "{{ openshift_setup_docker_images.group1 }}" | |
+ | |
+ #- name: Pull additional docker images for 3.9+ | |
+ #docker_image: | |
+ #name: "{{ item.img }}" | |
+ #state: present | |
+ #force: yes | |
+ #tag: "{{ item.tag }}" | |
+ #with_items: | |
+ #- "{{ openshift_setup_docker_images.group2 }}" | |
+ #when: (openshift_setup_image_tag == "latest") or | |
+ #("v3.9" in openshift_setup_image_tag) or | |
+ #("v3.10" in openshift_setup_image_tag) or | |
+ #("v3.11" in openshift_setup_image_tag) | |
+ | |
+ #- name: Pull additional docker images for 3.10+ | |
+ #docker_image: | |
+ #name: "{{ item.img }}" | |
+ #state: present | |
+ #force: yes | |
+ #tag: "{{ item.tag }}" | |
+ #with_items: | |
+ #- "{{ openshift_setup_docker_images.group3 }}" | |
+ #when: (openshift_setup_image_tag == "latest") or | |
+ #("v3.10" in openshift_setup_image_tag) or | |
+ #("v3.11" in openshift_setup_image_tag) | |
+ | |
+ #- name: Pull additional docker images for 3.11+ | |
+ #docker_image: | |
+ #name: "{{ item.img }}" | |
+ #state: present | |
+ #force: yes | |
+ #tag: "{{ item.tag }}" | |
+ #with_items: | |
+ #- "{{ openshift_setup_docker_images.group4 }}" | |
+ #when: | |
+ #- not("v3.7" in openshift_setup_image_tag) | |
+ #- not("v3.9" in openshift_setup_image_tag) | |
+ #- not("v3.10" in openshift_setup_image_tag) | |
+ | |
+ #- name: Pull images for all versions except v3.11+ | |
+ #docker_image: | |
+ #name: "{{ item.img }}" | |
+ #state: present | |
+ #force: yes | |
+ #tag: "{{ item.tag }}" | |
+ #with_items: | |
+ #- "{{ openshift_setup_docker_images.group5 }}" | |
+ #when: ("v3.7" in openshift_setup_image_tag) or | |
+ #("v3.9" in openshift_setup_image_tag) or | |
+ #("v3.10" in openshift_setup_image_tag) | |
- name: Create command line for oc cluster up execution for older oc clients up to 3.9 | |
set_fact: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment