Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Push changes to prep for prod openshift reinstall in about 30min.

Browse source
This commit is contained in:
Kevin Fenzi 2018-05-31 20:26:41 +00:00
parent 6d1150dbd4
commit 08d89934ec
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
playbooks/groups/os-cluster.yml
View file

@ -128,19 +128,20 @@
- { - {
role: ansible-ansible-openshift-ansible, role: ansible-ansible-openshift-ansible,
cluster_inventory_filename: "cluster-inventory", cluster_inventory_filename: "cluster-inventory",
openshift_release: "v3.6", openshift_release: "v3.9",
openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_path: "/root/openshift-ansible",
openshift_ansible_pre_playbook: "playbooks/prerequisites.yml",
openshift_ansible_playbook: "playbooks/byo/config.yml", openshift_ansible_playbook: "playbooks/byo/config.yml",
openshift_ansible_version: "openshift-ansible-3.6.173.0.81-1", openshift_ansible_version: "openshift-ansible-3.9.30-1",
openshift_ansible_ssh_user: root, openshift_ansible_ssh_user: root,
openshift_ansible_install_examples: true, openshift_ansible_install_examples: false,
openshift_ansible_containerized_deploy: false, openshift_ansible_containerized_deploy: false,
openshift_cluster_masters_group: "os-masters", openshift_cluster_masters_group: "os-masters",
openshift_cluster_nodes_group: "os-nodes", openshift_cluster_nodes_group: "os-nodes",
openshift_cluster_infra_group: "os-nodes", openshift_cluster_infra_group: "os-nodes",
openshift_auth_profile: "fedoraidp", openshift_auth_profile: "fedoraidp",
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 }}",

15
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
View file

@ -14,11 +14,10 @@ etcd
# Set variables common for all OSEv3 hosts # Set variables common for all OSEv3 hosts
[OSEv3:vars] [OSEv3:vars]
{% if env == "staging" %}
# Disable the service catalog. We don't use it and it needs persistent storage. # Disable the service catalog. We don't use it and it needs persistent storage.
openshift_enable_service_catalog=false openshift_enable_service_catalog=false
# Set this because we have nfs which isn't supported
openshift_enable_unsupported_configurations=true openshift_enable_unsupported_configurations=true
{% endif %}
# Have upgrader also restart systems in a rolling manner. # Have upgrader also restart systems in a rolling manner.
openshift_rolling_restart_mode=system openshift_rolling_restart_mode=system
# Disable the disk and package version tests # Disable the disk and package version tests
@ -437,12 +436,12 @@ openshift_hosted_registry_storage_nfs_directory=/
openshift_hosted_registry_storage_volume_name=openshift-stg-registry openshift_hosted_registry_storage_volume_name=openshift-stg-registry
openshift_hosted_registry_storage_volume_size=10Gi openshift_hosted_registry_storage_volume_size=10Gi
{% else %} {% else %}
#openshift_hosted_registry_storage_kind=nfs openshift_hosted_registry_storage_kind=nfs
#openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] openshift_hosted_registry_storage_access_modes=['ReadWriteMany']
#openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
#openshift_hosted_registry_storage_nfs_directory=/ openshift_hosted_registry_storage_nfs_directory=/
#openshift_hosted_registry_storage_volume_name=openshift_stg_01 openshift_hosted_registry_storage_volume_name=openshift-prod-registry
#openshift_hosted_registry_storage_volume_size=10Gi openshift_hosted_registry_storage_volume_size=10Gi
{% endif %} {% endif %}
# #
# Openstack # Openstack