diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-22 10:19:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 10:19:08 -0400 |
| commit | ea79d8b9efe03e06640cffe8b7e03580a3832c3a (patch) | |
| tree | 8dfe9c48265185fe0ad8b7e77df0bf6be0d1f97a | |
| parent | d1e87cea86851e7f2c89889761503cf271075df5 (diff) | |
| parent | bf9756228f1d37e78de0fde40f32f2e203dbb3e6 (diff) | |
| download | openshift-ea79d8b9efe03e06640cffe8b7e03580a3832c3a.tar.gz openshift-ea79d8b9efe03e06640cffe8b7e03580a3832c3a.tar.bz2 openshift-ea79d8b9efe03e06640cffe8b7e03580a3832c3a.tar.xz openshift-ea79d8b9efe03e06640cffe8b7e03580a3832c3a.zip | |
Merge pull request #4498 from mtnbikenc/verify-upgrade-node-label
Verify matched openshift_upgrade_nodes_label
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml index 046535680..72de63070 100644 --- a/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml @@ -6,27 +6,32 @@ - lib_openshift tasks: - - name: Retrieve list of openshift nodes matching upgrade label - oc_obj: - state: list - kind: node - selector: "{{ openshift_upgrade_nodes_label }}" - register: nodes_to_upgrade - when: openshift_upgrade_nodes_label is defined + - when: openshift_upgrade_nodes_label is defined + block: + - name: Retrieve list of openshift nodes matching upgrade label + oc_obj: + state: list + kind: node + selector: "{{ openshift_upgrade_nodes_label }}" + register: nodes_to_upgrade - # We got a list of nodes with the label, now we need to match these with inventory hosts - # using their openshift.common.hostname fact. - - name: Map labelled nodes to inventory hosts - add_host: - name: "{{ item }}" - groups: temp_nodes_to_upgrade - ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" - ansible_become: "{{ g_sudo | default(omit) }}" - with_items: " {{ groups['oo_nodes_to_config'] }}" - when: - - openshift_upgrade_nodes_label is defined - - hostvars[item].openshift.common.hostname in nodes_to_upgrade.results.results[0]['items'] | map(attribute='metadata.name') | list - changed_when: false + - name: Fail if no nodes match openshift_upgrade_nodes_label + fail: + msg: "openshift_upgrade_nodes_label was specified but no nodes matched" + when: nodes_to_upgrade.results.results[0]['items'] | length == 0 + + # We got a list of nodes with the label, now we need to match these with inventory hosts + # using their openshift.common.hostname fact. + - name: Map labelled nodes to inventory hosts + add_host: + name: "{{ item }}" + groups: temp_nodes_to_upgrade + ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" + ansible_become: "{{ g_sudo | default(omit) }}" + with_items: " {{ groups['oo_nodes_to_config'] }}" + when: + - hostvars[item].openshift.common.hostname in nodes_to_upgrade.results.results[0]['items'] | map(attribute='metadata.name') | list + changed_when: false # Build up the oo_nodes_to_upgrade group, use the list filtered by label if # present, otherwise hit all nodes: |