From ae34281f89e1b62dc95ef33a30a20bbb7c70b077 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 5 May 2016 16:06:42 -0400 Subject: Remove vars_files on play includes for upgrade playbooks. --- .../upgrades/v3_1_to_v3_2/upgrade.yml | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml') diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index a929e4a6a..8c89e118e 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -1,14 +1,25 @@ --- +- hosts: localhost + connection: local + become: no + gather_facts: no + tasks: + - include_vars: ../../../../byo/openshift-cluster/cluster_hosts.yml + - add_host: + name: "{{ item }}" + groups: l_oo_all_hosts + with_items: g_all_hosts | default([]) + +- hosts: l_oo_all_hosts + gather_facts: no + tasks: + - include_vars: ../../../../byo/openshift-cluster/cluster_hosts.yml + - include: ../../../../common/openshift-cluster/evaluate_groups.yml vars: - g_etcd_hosts: "{{ groups.etcd | default([]) }}" - g_master_hosts: "{{ groups.masters | default([]) }}" + # Do not allow adding hosts during upgrade. g_new_master_hosts: [] - g_nfs_hosts: "{{ groups.nfs | default([]) }}" - g_node_hosts: "{{ groups.nodes | default([]) }}" - g_lb_hosts: "{{ groups.lb | default([]) }}" - g_all_hosts: "{{ groups.masters | default([]) | union(groups.nodes | default([])) | union(groups.etcd | default([])) - | union(groups.lb | default([])) | union(groups.nfs | default([])) }}" + g_new_node_hosts: [] openshift_cluster_id: "{{ cluster_id | default('default') }}" openshift_deployment_type: "{{ deployment_type }}" -- cgit v1.2.3 From a79d25b64bca2b95fb5cb2c2420fd9d10bfd1337 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 12 May 2016 17:19:09 -0400 Subject: Block upgrading w/ ansible v2. --- playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml') diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index 8c89e118e..24617620b 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -4,6 +4,10 @@ become: no gather_facts: no tasks: + - name: Verify Ansible version is greater than or equal to 1.9.4 and less than 2.0 + fail: + msg: "Unsupported ansible version: {{ ansible_version }} found." + when: ansible_version.full | version_compare('1.9.4', 'lt') or ansible_version.full | version_compare('2.0', 'ge') - include_vars: ../../../../byo/openshift-cluster/cluster_hosts.yml - add_host: name: "{{ item }}" -- cgit v1.2.3