Wolfgang Kulhanek
2019-06-06 8df23a399f065b1220d3a430d8d105ceabeed674
OCP 4.1 GA Cleanup (remove all beta stuff)
23 files deleted
1 files copied
6 files modified
1 files renamed
1006 ■■■■■ changed files
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.3.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.4.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.5.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.7.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0.j2 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.j2 20 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.10.1.j2 31 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.16.1.j2 36 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.9.1.j2 31 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/software.yml 35 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.0.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.3.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.4.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.5.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.7.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0.j2 1 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.j2 20 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.v0.10.1.j2 31 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.v0.16.1.j2 36 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.v0.9.1.j2 31 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/software.yml 35 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.0.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.3.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.4.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.5.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.7.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.j2 20 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.v0.10.1.j2 31 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.v0.16.1.j2 36 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.v0.9.1.j2 31 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/software.yml 34 ●●●● patch | view | raw | blame | history
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.3.j2
File was deleted
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.4.j2
File was deleted
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.5.j2
File was deleted
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.7.j2
File was deleted
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0.j2
File was renamed from ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.0.j2
@@ -36,4 +36,3 @@
pullSecret: '{{ ocp4_token }}'
sshKey: |
  {{ idrsapub.content | b64decode }}
ansible/configs/ocp4-ha-lab/files/install-config.yaml.j2
@@ -1,26 +1,34 @@
apiVersion: v1beta3
---
apiVersion: v1
baseDomain: {{ ocp4_base_domain | default(guid + subdomain_base_suffix) }}
compute:
- name: worker
- hyperthreading: Enabled
  name: worker
  platform:
    aws:
      type: {{ worker_instance_type }}
      rootVolume:
        type: {{ worker_storage_type }}
  replicas: {{ worker_instance_count }}
controlPlane:
  hyperthreading: Enabled
  name: master
  platform:
    aws:
      type: {{ master_instance_type }}
      rootVolume:
        type: {{ master_storage_type }}
  replicas: {{ master_instance_count }}
metadata:
  name: {{ cluster_name }}
networking:
  clusterNetworks:
  clusterNetwork:
  - cidr: 10.128.0.0/14
    hostSubnetLength: 9
    hostPrefix: 23
  machineCIDR: 10.0.0.0/16
  serviceCIDR: 172.30.0.0/16
  type: OpenShiftSDN
  serviceNetwork:
  - 172.30.0.0/16
  networkType: OpenshiftSDN
platform:
  aws:
    region: {{ aws_region_final | d(aws_region) }}
ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.10.1.j2
File was deleted
ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.16.1.j2
File was deleted
ansible/configs/ocp4-ha-lab/files/install-config.yaml.v0.9.1.j2
File was deleted
ansible/configs/ocp4-ha-lab/software.yml
@@ -59,29 +59,7 @@
              - python2-boto3
              - unzip
        - name: Get the OpenShift Installer (up to Beta3)
          when: ocp4_installer_version | regex_replace('^v', '') is version_compare('0.17', '<')
          become: yes
          get_url:
            url: "https://github.com/openshift/installer/releases/download/{{ ocp4_installer_version }}/openshift-install-linux-amd64"
            dest: /usr/bin/openshift-install
            mode: 0775
            owner: root
            group: root
        - name: Get the OpenShift CLI (up to Beta3)
          when: ocp4_installer_version | regex_replace('^v', '') 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 | regex_replace('^v', '') is version_compare('4.0', '>=')
        - name: Get the OpenShift Installer
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-install-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -91,8 +69,7 @@
            owner: root
            group: root
        - name: Get the OpenShift CLI for Beta4 onwards
          when: ocp4_installer_version | regex_replace('^v', '') is version_compare('4.0', '>=')
        - name: Get the OpenShift CLI
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-client-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -122,7 +99,8 @@
            path: /home/{{ ansible_user }}/{{ cluster_name }}
            state: directory
        - stat:
        - name: Check if version specific install-config.j2 exists
          stat:
            path: files/install-config.yaml.{{ ocp4_installer_version }}.j2
          register: rconfig
          delegate_to: localhost
@@ -183,28 +161,23 @@
          delay: 30
          until: routeconsole is succeeded
          ignore_errors: yes
#          tags: post_flight_check
        - name: Set webconsole address
          set_fact:
            webconsole: "http://{{ routeconsole.stdout | from_json | json_query('spec.host') }}"
          when: routeconsole is succeeded
#          tags: post_flight_check
        # sometimes the route is not ready, guess it
        - name: Guess webconsole address
          set_fact:
            webconsole: "http://console-openshift-console.apps.{{ cluster_name }}.{{ guid }}.{{ subdomain_base }}"
          when: routeconsole is failed
#          tags: post_flight_check
        - name: Get API for command line
          environment:
            KUBECONFIG: /home/{{ ansible_user }}/{{ cluster_name }}/auth/kubeconfig
          command: oc whoami --show-server
          register: showserver
#          tags: post_flight_check
        - name: Print Overview
          debug:
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.0.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.3.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.4.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.5.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0-rc.7.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0.j2
copy from ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.0.j2 copy to ansible/configs/ocp4-shared/files/install-config.yaml.4.1.0.j2
File was copied from ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.0-rc.0.j2
@@ -36,4 +36,3 @@
pullSecret: '{{ ocp4_token }}'
sshKey: |
  {{ idrsapub.content | b64decode }}
ansible/configs/ocp4-shared/files/install-config.yaml.j2
@@ -1,26 +1,34 @@
apiVersion: v1beta3
---
apiVersion: v1
baseDomain: {{ ocp4_base_domain | default(guid + subdomain_base_suffix) }}
compute:
- name: worker
- hyperthreading: Enabled
  name: worker
  platform:
    aws:
      type: {{ worker_instance_type }}
      rootVolume:
        type: {{ worker_storage_type }}
  replicas: {{ worker_instance_count }}
controlPlane:
  hyperthreading: Enabled
  name: master
  platform:
    aws:
      type: {{ master_instance_type }}
      rootVolume:
        type: {{ master_storage_type }}
  replicas: {{ master_instance_count }}
metadata:
  name: {{ cluster_name }}
networking:
  clusterNetworks:
  clusterNetwork:
  - cidr: 10.128.0.0/14
    hostSubnetLength: 9
    hostPrefix: 23
  machineCIDR: 10.0.0.0/16
  serviceCIDR: 172.30.0.0/16
  type: OpenShiftSDN
  serviceNetwork:
  - 172.30.0.0/16
  networkType: OpenshiftSDN
platform:
  aws:
    region: {{ aws_region_final | d(aws_region) }}
ansible/configs/ocp4-shared/files/install-config.yaml.v0.10.1.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.v0.16.1.j2
File was deleted
ansible/configs/ocp4-shared/files/install-config.yaml.v0.9.1.j2
File was deleted
ansible/configs/ocp4-shared/software.yml
@@ -59,29 +59,7 @@
              - python2-boto3
              - unzip
        - name: Get the OpenShift Installer (up to Beta3)
          when: ocp4_installer_version | regex_replace('^v', '') is version_compare('0.17', '<')
          become: yes
          get_url:
            url: "https://github.com/openshift/installer/releases/download/{{ ocp4_installer_version }}/openshift-install-linux-amd64"
            dest: /usr/bin/openshift-install
            mode: 0775
            owner: root
            group: root
        - name: Get the OpenShift CLI (up to Beta3)
          when: ocp4_installer_version | regex_replace('^v', '') 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 | regex_replace('^v', '') is version_compare('4.0', '>=')
        - name: Get the OpenShift Installer
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-install-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -91,8 +69,7 @@
            owner: root
            group: root
        - name: Get the OpenShift CLI for Beta4 onwards
          when: ocp4_installer_version | regex_replace('^v', '') is version_compare('4.0', '>=')
        - name: Get the OpenShift CLI
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-client-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -122,7 +99,8 @@
            path: /home/{{ ansible_user }}/{{ cluster_name }}
            state: directory
        - stat:
        - name: Check if version specific install-config.j2 exists
          stat:
            path: files/install-config.yaml.{{ ocp4_installer_version }}.j2
          register: rconfig
          delegate_to: localhost
@@ -198,28 +176,23 @@
          delay: 30
          until: routeconsole is succeeded
          ignore_errors: yes
#          tags: post_flight_check
        - name: Set webconsole address
          set_fact:
            webconsole: "http://{{ routeconsole.stdout | from_json | json_query('spec.host') }}"
          when: routeconsole is succeeded
#          tags: post_flight_check
        # sometimes the route is not ready, guess it
        - name: Guess webconsole address
          set_fact:
            webconsole: "http://console-openshift-console.apps.{{ cluster_name }}.{{ guid }}{{ subdomain_base_suffix }}"
          when: routeconsole is failed
#          tags: post_flight_check
        - name: Get API for command line
          environment:
            KUBECONFIG: /home/{{ ansible_user }}/{{ cluster_name }}/auth/kubeconfig
          command: oc whoami --show-server
          register: showserver
#          tags: post_flight_check
        - name: Print Overview
          debug:
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.0.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.3.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.4.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.5.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.0-rc.7.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.j2
@@ -1,26 +1,34 @@
apiVersion: v1beta3
---
apiVersion: v1
baseDomain: {{ ocp4_base_domain | default(guid + subdomain_base_suffix) }}
compute:
- name: worker
- hyperthreading: Enabled
  name: worker
  platform:
    aws:
      type: {{ worker_instance_type }}
      rootVolume:
        type: {{ worker_storage_type }}
  replicas: {{ worker_instance_count }}
controlPlane:
  hyperthreading: Enabled
  name: master
  platform:
    aws:
      type: {{ master_instance_type }}
      rootVolume:
        type: {{ master_storage_type }}
  replicas: {{ master_instance_count }}
metadata:
  name: {{ cluster_name }}
networking:
  clusterNetworks:
  clusterNetwork:
  - cidr: 10.128.0.0/14
    hostSubnetLength: 9
    hostPrefix: 23
  machineCIDR: 10.0.0.0/16
  serviceCIDR: 172.30.0.0/16
  type: OpenShiftSDN
  serviceNetwork:
  - 172.30.0.0/16
  networkType: OpenshiftSDN
platform:
  aws:
    region: {{ aws_region_final | d(aws_region) }}
ansible/configs/ocp4-workshop/files/install-config.yaml.v0.10.1.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.v0.16.1.j2
File was deleted
ansible/configs/ocp4-workshop/files/install-config.yaml.v0.9.1.j2
File was deleted
ansible/configs/ocp4-workshop/software.yml
@@ -59,29 +59,7 @@
              - python2-boto3
              - unzip
        - name: Get the OpenShift Installer (up to Beta3)
          when: ocp4_installer_version | regex_replace('^v', '') is version_compare('0.17', '<')
          become: yes
          get_url:
            url: "https://github.com/openshift/installer/releases/download/{{ ocp4_installer_version }}/openshift-install-linux-amd64"
            dest: /usr/bin/openshift-install
            mode: 0775
            owner: root
            group: root
        - name: Get the OpenShift CLI (up to Beta3)
          when: ocp4_installer_version | regex_replace('^v', '') 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 | regex_replace('^v', '') is version_compare('4.0', '>=')
        - name: Get the OpenShift Installer
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-install-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -91,8 +69,7 @@
            owner: root
            group: root
        - name: Get the OpenShift CLI for Beta4 onwards
          when: ocp4_installer_version | regex_replace('^v', '') is version_compare('4.0', '>=')
        - name: Get the OpenShift CLI
          become: yes
          unarchive:
            src: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/{{ ocp4_installer_version }}/openshift-client-linux-{{ ocp4_installer_version }}.tar.gz"
@@ -122,7 +99,8 @@
            path: /home/{{ ansible_user }}/{{ cluster_name }}
            state: directory
        - stat:
        - name: Check if version specific install-config.j2 exists
          stat:
            path: files/install-config.yaml.{{ ocp4_installer_version }}.j2
          register: rconfig
          delegate_to: localhost
@@ -198,27 +176,23 @@
          delay: 30
          until: routeconsole is succeeded
          ignore_errors: yes
#          tags: post_flight_check
        - name: Set webconsole address
          set_fact:
            webconsole: "http://{{ routeconsole.stdout | from_json | json_query('spec.host') }}"
          when: routeconsole is succeeded
#          tags: post_flight_check
        # sometimes the route is not ready, guess it
        - name: Guess webconsole address
          set_fact:
            webconsole: "http://console-openshift-console.apps.{{ cluster_name }}.{{ guid }}.{{ subdomain_base }}"
          when: routeconsole is failed
#          tags: post_flight_check
        - name: Get API for command line
          environment:
            KUBECONFIG: /home/{{ ansible_user }}/{{ cluster_name }}/auth/kubeconfig
          command: oc whoami --show-server
          register: showserver
#          tags: post_flight_check
        - name: Print Overview
          debug: