Merge pull request #9058 from vrutkovs/standalone-etcds-node-upgrade

Don't upgrade nodes which only have dedicated etcd

playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml

@@ -42,5 +42,8 @@
       groups: oo_nodes_to_upgrade
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
+    when: item not in dedicated_etcds
+    vars:
+      dedicated_etcds: "{{ groups['oo_etcd_to_config'] | difference(groups['oo_masters']) }}"
     with_items: "{{ groups['temp_nodes_to_upgrade'] | default(groups['oo_nodes_to_config']) }}"
     changed_when: False

playbooks/common/openshift-cluster/upgrades/pre/config.yml

@@ -71,6 +71,9 @@
   - role: openshift_facts
   tasks:
   - import_tasks: verify_upgrade_targets.yml
+    vars:
+      dedicated_etcds: "{{ groups['oo_etcd_to_config'] | difference(groups['oo_masters']) }}"
+    when: inventory_hostname not in dedicated_etcds
 
 - name: Verify docker upgrade targets
   hosts: "{{ l_upgrade_docker_target_hosts }}"