Added additional check to not break Beta3 installs

Wolfgang Kulhanek

2019-04-24 d30ca61e3f742573407722446908f4390dcb08b0

Added additional check to not break Beta3 installs

 ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.0.j2

@@ -1,6 +1,15 @@
---
apiVersion: v1
baseDomain: {{ ocp4_base_domain | default(guid + subdomain_base_suffix) }}
compute:
- hyperthreading: Enabled
  name: worker 
  platform:
    aws:
      type: {{ worker_instance_type }}
      rootVolume:
        type: {{ worker_storage_type }}
  replicas: {{ worker_instance_count }}
controlPlane:
  hyperthreading: Enabled
  name: master
@@ -10,15 +19,6 @@
      rootVolume:
        type: {{ master_storage_type }}
  replicas: {{ master_instance_count }}
compute:
- name: worker
  hyperthreading: Enabled
  platform:
    aws:
      type: {{ worker_instance_type }}
      rootVolume:
        type: {{ worker_storage_type }}
  replicas: {{ worker_instance_count }}
metadata:
  name: {{ cluster_name }}
networking:

 ansible/configs/ocp4-workshop/software.yml

@@ -59,7 +59,29 @@
              - python2-boto3
              - unzip

        - name: Get the OpenShift Installer
        - name: Get the OpenShift Installer (up to Beta3)
          when: ocp4_installer_version is version_compare('0.17', '<')
          become: yes
          get_url:
            url: "https://github.com/openshift/installer/releases/download/{{ ocp4_installer_version }}/openshift-install-{{ GOOS_VAR.stdout }}-{{ GOARCH_VAR.stdout }}"
            dest: /usr/bin/openshift-install
            mode: 0775
            owner: root
            group: root

        - name: Get the OpenShift CLI (up to Beta3)
          when: ocp4_installer_version is version_compare('0.17', '<')
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v3/clients/{{ oc_client_version }}/linux/oc.tar.gz"
            remote_src: yes
            dest: /usr/bin
            mode: 0775
            owner: root
            group: root

        - name: Get the OpenShift Installer for Beta4 onwards
          when: ocp4_installer_version is version_compare('4.0', '>=')
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-install-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -69,7 +91,8 @@
            owner: root
            group: root

        - name: Get the OpenShift CLI
        - name: Get the OpenShift CLI for Beta4 onwards
          when: ocp4_installer_version is version_compare('4.0', '>=')
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-client-linux-{{ ocp4_installer_version }}.tar.gz"