diff options
Diffstat (limited to 'playbooks')
4 files changed, 7 insertions, 8 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 834461e14..12c5566c4 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -42,6 +42,5 @@ command: > {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" - when: openshift.node.schedulable | bool when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_upgrade and openshift.node.schedulable | bool diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml index 9a5d84751..7b915248b 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml @@ -92,9 +92,9 @@ vars: master_config_hook: "v3_3/master_config_upgrade.yml" -- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml - - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml vars: node_config_hook: "v3_3/node_config_upgrade.yml" +- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml + diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml index 4f8a80ee8..4530f79cf 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml @@ -90,7 +90,7 @@ - include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml -- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml - - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml +- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml + diff --git a/playbooks/common/openshift-cluster/verify_ansible_version.yml b/playbooks/common/openshift-cluster/verify_ansible_version.yml index d75b23bf7..8be8fbf04 100644 --- a/playbooks/common/openshift-cluster/verify_ansible_version.yml +++ b/playbooks/common/openshift-cluster/verify_ansible_version.yml @@ -1,11 +1,11 @@ --- -- name: Verify Ansible version is greater than or equal to 2.1.0.0 +- name: Verify Ansible version is greater than or equal to 2.2.0 hosts: localhost connection: local become: no gather_facts: no tasks: - - name: Verify Ansible version is greater than or equal to 2.1.0.0 + - name: Verify Ansible version is greater than or equal to 2.2.0 fail: msg: "Unsupported ansible version: {{ ansible_version.full }} found" - when: not ansible_version.full | version_compare('2.1.0.0', 'ge') + when: not ansible_version.full | version_compare('2.2.0', 'ge') |