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

OSBS: Use osbs-cluster.yml for current prod and osbs/deploy-cluster.yml for new cluster in stg

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2019-11-26 14:54:36 +01:00 • committed by Pierre-Yves Chibon
parent 770a57bd22
commit d00395d3d2
2 changed files with 3 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

31
playbooks/groups/osbs-cluster.yml
View file

@ -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

27
playbooks/groups/osbs/deploy-cluster.yml
View file

@ -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