Update OpenShift in stg to 3.7 hopefully and reinstall vm's to get larger disks.
This commit is contained in:
parent
201237b9d0
commit
45748f17d0
3 changed files with 3 additions and 19 deletions
|
@ -99,10 +99,10 @@
|
||||||
- {
|
- {
|
||||||
role: ansible-ansible-openshift-ansible,
|
role: ansible-ansible-openshift-ansible,
|
||||||
cluster_inventory_filename: "cluster-inventory-stg",
|
cluster_inventory_filename: "cluster-inventory-stg",
|
||||||
openshift_release: "v3.6",
|
openshift_release: "v3.7",
|
||||||
openshift_ansible_path: "/root/openshift-ansible",
|
openshift_ansible_path: "/root/openshift-ansible",
|
||||||
openshift_ansible_playbook: "playbooks/byo/config.yml",
|
openshift_ansible_playbook: "playbooks/byo/config.yml",
|
||||||
openshift_ansible_version: "openshift-ansible-3.5.70-1",
|
openshift_ansible_version: "openshift-ansible-3.7.32-1",
|
||||||
openshift_ansible_ssh_user: root,
|
openshift_ansible_ssh_user: root,
|
||||||
openshift_ansible_install_examples: true,
|
openshift_ansible_install_examples: true,
|
||||||
openshift_ansible_containerized_deploy: false,
|
openshift_ansible_containerized_deploy: false,
|
||||||
|
@ -111,7 +111,7 @@
|
||||||
openshift_cluster_infra_group: "os-nodes-stg",
|
openshift_cluster_infra_group: "os-nodes-stg",
|
||||||
openshift_auth_profile: "fedoraidp-stg",
|
openshift_auth_profile: "fedoraidp-stg",
|
||||||
openshift_master_ha: true,
|
openshift_master_ha: true,
|
||||||
openshift_debug_level: 2,
|
openshift_debug_level: 1,
|
||||||
openshift_deployment_type: "openshift-enterprise",
|
openshift_deployment_type: "openshift-enterprise",
|
||||||
openshift_cluster_url: "{{ os_url}}",
|
openshift_cluster_url: "{{ os_url}}",
|
||||||
openshift_app_subdomain: "{{ os_app_url }}",
|
openshift_app_subdomain: "{{ os_app_url }}",
|
||||||
|
|
|
@ -14,19 +14,6 @@
|
||||||
repo: "https://github.com/openshift/openshift-ansible.git"
|
repo: "https://github.com/openshift/openshift-ansible.git"
|
||||||
dest: "{{ openshift_ansible_path }}"
|
dest: "{{ openshift_ansible_path }}"
|
||||||
version: "{{ openshift_ansible_version }}"
|
version: "{{ openshift_ansible_version }}"
|
||||||
when: env == "production"
|
|
||||||
|
|
||||||
# Need to use my fork in stage until these are merged upstream and backported
|
|
||||||
# to the release-3.6 branch
|
|
||||||
#
|
|
||||||
# https://github.com/openshift/openshift-ansible/pull/5101
|
|
||||||
# https://github.com/openshift/openshift-ansible/pull/5129
|
|
||||||
- name: git clone the openshift-ansible repo
|
|
||||||
git:
|
|
||||||
repo: "https://github.com/maxamillion/openshift-ansible"
|
|
||||||
dest: "{{ openshift_ansible_path }}"
|
|
||||||
version: "{{ openshift_ansible_version }}"
|
|
||||||
when: env == "staging"
|
|
||||||
|
|
||||||
- name: generate the inventory file
|
- name: generate the inventory file
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -693,9 +693,6 @@ openshift_master_console_port={{openshift_console_port}}
|
||||||
# networking and liveness or readiness probes.
|
# networking and liveness or readiness probes.
|
||||||
# Setting this variable to true will override that check.
|
# Setting this variable to true will override that check.
|
||||||
#openshift_override_hostname_check=true
|
#openshift_override_hostname_check=true
|
||||||
# Disable this check because we only have 20G disks right now
|
|
||||||
# - kevin (2018-02-21)
|
|
||||||
openshift_disable_check=disk_availability
|
|
||||||
|
|
||||||
# Configure dnsmasq for cluster dns, switch the host's local resolver to use dnsmasq
|
# Configure dnsmasq for cluster dns, switch the host's local resolver to use dnsmasq
|
||||||
# and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults
|
# and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue