diff --git a/inventory/group_vars/os b/inventory/group_vars/os index 45680bed19..325ae29082 100644 --- a/inventory/group_vars/os +++ b/inventory/group_vars/os @@ -3,4 +3,4 @@ host_group: os baseiptables: False no_http2: True nm_controlled_resolv: True -#openshift_ansible_upgrading: True +openshift_ansible_upgrading: True diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 6ed39040c1..e7836a2980 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -184,7 +184,36 @@ openshift_shared_infra: true, openshift_ansible_use_crio: true, openshift_ansible_crio_only: false, - when: env != 'staging', + when: env != 'staging' and datacenter == 'phx2', + tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] + } + - { + role: ansible-ansible-openshift-ansible, + cluster_inventory_filename: "cluster-inventory", + openshift_release: "v3.11", + openshift_ansible_path: "/root/openshift-ansible", + openshift_ansible_pre_playbook: "playbooks/prerequisites.yml", + openshift_ansible_playbook: "playbooks/deploy_cluster.yml", + openshift_ansible_version: "openshift-ansible-3.11.145-1", + openshift_ansible_ssh_user: root, + openshift_ansible_install_examples: true, + openshift_ansible_containerized_deploy: false, + openshift_cluster_masters_group: "os_masters", + openshift_cluster_nodes_group: "os_nodes", + openshift_cluster_infra_group: "os_nodes", + openshift_auth_profile: "fedoraidp", + openshift_master_ha: true, + openshift_debug_level: 1, + openshift_deployment_type: "openshift-enterprise", + openshift_cluster_url: "{{ os_url}}", + openshift_app_subdomain: "{{ os_app_url }}", + openshift_internal_cluster_url: "os-masters{{ env_suffix }}.iad2.fedoraproject.org", + openshift_api_port: 443, + openshift_console_port: 443, + openshift_shared_infra: true, + openshift_ansible_use_crio: true, + openshift_ansible_crio_only: false, + when: env != 'staging' and datacenter == 'iad2', tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] }