diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 9b427e8b0e..74b1d74aec 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -229,11 +229,11 @@ - role: ansible-ansible-openshift-ansible cluster_inventory_filename: "{{ inventory_filename }}" openshift_master_public_api_url: "https://{{ osbs_url }}:8443" - openshift_release: "v3.11" + openshift_release: "v3.9.0" 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.51-1" + openshift_ansible_version: "openshift-ansible-3.9.37-1" openshift_ansible_ssh_user: root openshift_ansible_install_examples: false openshift_ansible_containerized_deploy: true @@ -250,32 +250,7 @@ openshift_ansible_use_crio: false openshift_ansible_crio_only: false tags: ['openshift-cluster-x86','ansible-ansible-openshift-ansible'] - when: env != "staging" - - - role: ansible-ansible-openshift-ansible - cluster_inventory_filename: "{{ inventory_filename }}" - openshift_master_public_api_url: "https://{{ osbs_url }}:8443" - 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.51-1" - openshift_ansible_ssh_user: root - openshift_ansible_install_examples: false - openshift_ansible_containerized_deploy: false - openshift_cluster_masters_group: "{{ cluster_masters_group }}" - openshift_cluster_nodes_group: "{{ cluster_nodes_group }}" - openshift_cluster_infra_group: "{{ cluster_infra_group }}" - openshift_auth_profile: "osbs" - openshift_cluster_url: "https://{{osbs_url}}" - openshift_master_ha: false - openshift_debug_level: 2 - openshift_shared_infra: true - openshift_deployment_type: "openshift-enterprise" - openshift_ansible_use_crio: false - openshift_ansible_crio_only: false - tags: ['openshift-cluster-x86','ansible-ansible-openshift-ansible'] - when: env == "staging" + when: env == "production" - name: Deploy OpenShift Cluster aarch64 hosts: osbs_control:osbs_control_stg diff --git a/playbooks/groups/osbs/deploy-cluster.yml b/playbooks/groups/osbs/deploy-cluster.yml index 51d968db65..fddb72f009 100644 --- a/playbooks/groups/osbs/deploy-cluster.yml +++ b/playbooks/groups/osbs/deploy-cluster.yml @@ -226,32 +226,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - role: ansible-ansible-openshift-ansible - cluster_inventory_filename: "{{ inventory_filename }}" - openshift_master_public_api_url: "https://{{ osbs_url }}:8443" - 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: "v3.9.0" - openshift_ansible_ssh_user: root - openshift_ansible_install_examples: false - openshift_ansible_containerized_deploy: true - openshift_cluster_masters_group: "{{ cluster_masters_group }}" - openshift_cluster_nodes_group: "{{ cluster_nodes_group }}" - openshift_cluster_infra_group: "{{ cluster_infra_group }}" - openshift_auth_profile: "osbs" - openshift_cluster_url: "https://{{osbs_url}}" - openshift_master_ha: false - openshift_debug_level: 2 - openshift_shared_infra: true - openshift_deployment_type: "origin" - openshift_ansible_python_interpreter: "/usr/bin/python3" - openshift_ansible_use_crio: false - openshift_ansible_crio_only: false - tags: ['openshift-cluster-x86','ansible-ansible-openshift-ansible'] - when: env == "production" - - role: ansible-ansible-openshift-ansible cluster_inventory_filename: "{{ inventory_filename }}" openshift_master_public_api_url: "https://{{ osbs_url }}:8443" @@ -275,7 +249,6 @@ openshift_ansible_use_crio: false openshift_ansible_crio_only: false tags: ['openshift-cluster-x86','ansible-ansible-openshift-ansible'] - when: env == "staging" - name: Deploy OpenShift Cluster aarch64 hosts: osbs_control:osbs_control_stg