Skip to content

Commit

Permalink
Merge pull request #27 from tahonen/master
Browse files Browse the repository at this point in the history
installer and CoreOS version update
  • Loading branch information
Tero Ahonen authored Sep 2, 2019
2 parents cb9b7aa + cd1d606 commit 53ca832
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
9 changes: 2 additions & 7 deletions ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ update_hosts: true
libvirt_storage_pool: default


#ocpinstaller_url: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-install-linux-4.1.9.tar.gz"
#ocpinstaller_url: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.2.0-0.nightly-2019-08-14-112500/openshift-install-linux-4.2.0-0.nightly-2019-08-14-112500.tar.gz"
ocpinstaller_url: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.2.0-0.nightly-2019-08-20-111632/openshift-install-linux-4.2.0-0.nightly-2019-08-20-111632.tar.gz"

#ocpclient_url: 'https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux-4.1.9.tar.gz'
#ocpclient_url: 'https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.2.0-0.nightly-2019-08-14-112500/openshift-client-linux-4.2.0-0.nightly-2019-08-14-112500.tar.gz'
ocpclient_url: 'https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.2.0-0.nightly-2019-08-20-111632/openshift-client-linux-4.2.0-0.nightly-2019-08-20-111632.tar.gz'
ocpinstaller_url: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.2.0-0.nightly-2019-08-29-062233/openshift-install-linux-4.2.0-0.nightly-2019-08-29-062233.tar.gz"
ocpclient_url: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.2.0-0.nightly-2019-08-29-062233/openshift-client-linux-4.2.0-0.nightly-2019-08-29-062233.tar.gz"
# subnet address for the openshift cluster
subnet: 192.168.222

Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/openshift-4-cluster/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ master_count: "3"
compute_count: "3"

# reference to coreos qcow file
coreos_version: 42.80.20190801.0
coreos_version: 42.80.20190828.2
coreos_image_location: /var/lib/libvirt/images/rhcos-{{ coreos_version }}-qemu.qcow2


certificates_dir: "{{ playbook_dir }}/../certificate"
certficate_fullchain: "{{ certificates_dir }}/{{ cluster_name }}.{{ public_domain }}/fullchain.crt"
certficate_key: "{{ certificates_dir }}/{{ cluster_name }}.{{ public_domain }}/cert.key"
certficate_key: "{{ certificates_dir }}/{{ cluster_name }}.{{ public_domain }}/cert.key"

0 comments on commit 53ca832

Please sign in to comment.