parent: c0d3b216 | patch | commit | ignore whitespace
Wolfgang Kulhanek
2019-06-17 122aa824ec8662a20d2c2a50cf51357cda7872ee 
Prep for OCP 4.1.1 release
3 files added
117 ■■■■■ changed files
ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.1.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-shared/files/install-config.yaml.4.1.1.j2 39 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.1.j2 39 ●●●●● patch | view | raw | blame | history 
 ansible/configs/ocp4-ha-lab/files/install-config.yaml.4.1.1.j2


New file


@@ -0,0 +1,39 @@


---


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


  platform:


    aws:


      type: {{ master_instance_type }}


      rootVolume:


        type: {{ master_storage_type }}


  replicas: {{ master_instance_count }}


metadata:


  name: {{ cluster_name }}


networking:


  clusterNetwork:


  - cidr: 10.128.0.0/14


    hostPrefix: 23


  machineCIDR: 10.0.0.0/16


  serviceNetwork:


  - 172.30.0.0/16


  networkType: OpenshiftSDN


platform:


  aws:


    region: {{ aws_region_final | d(aws_region) }}


    userTags: {{ hostvars.localhost.cf_tags_final | d({}) | to_json }}


pullSecret: '{{ ocp4_token }}'


sshKey: |


  {{ idrsapub.content | b64decode }}






 ansible/configs/ocp4-shared/files/install-config.yaml.4.1.1.j2


New file


@@ -0,0 +1,39 @@


---


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


  platform:


    aws:


      type: {{ master_instance_type }}


      rootVolume:


        type: {{ master_storage_type }}


  replicas: {{ master_instance_count }}


metadata:


  name: {{ cluster_name }}


networking:


  clusterNetwork:


  - cidr: 10.128.0.0/14


    hostPrefix: 23


  machineCIDR: 10.0.0.0/16


  serviceNetwork:


  - 172.30.0.0/16


  networkType: OpenshiftSDN


platform:


  aws:


    region: {{ aws_region_final | d(aws_region) }}


    userTags: {{ hostvars.localhost.cf_tags_final | d({}) | to_json }}


pullSecret: '{{ ocp4_token }}'


sshKey: |


  {{ idrsapub.content | b64decode }}






 ansible/configs/ocp4-workshop/files/install-config.yaml.4.1.1.j2


New file


@@ -0,0 +1,39 @@


---


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


  platform:


    aws:


      type: {{ master_instance_type }}


      rootVolume:


        type: {{ master_storage_type }}


  replicas: {{ master_instance_count }}


metadata:


  name: {{ cluster_name }}


networking:


  clusterNetwork:


  - cidr: 10.128.0.0/14


    hostPrefix: 23


  machineCIDR: 10.0.0.0/16


  serviceNetwork:


  - 172.30.0.0/16


  networkType: OpenshiftSDN


platform:


  aws:


    region: {{ aws_region_final | d(aws_region) }}


    userTags: {{ hostvars.localhost.cf_tags_final | d({}) | to_json }}


pullSecret: '{{ ocp4_token }}'


sshKey: |


  {{ idrsapub.content | b64decode }}