Bläddra i källkod

Merge pull request #5536 from ingvagabund/make-difference-output-list-3.7

Automatic merge from submit-queue

make difference filter output a list for Python3

Fixes: #3934
OpenShift Merge Robot 7 år sedan
förälder
incheckning
944e91554d

+ 1 - 1
playbooks/common/openshift-cluster/upgrades/etcd/backup.yml

@@ -20,7 +20,7 @@
                                  | oo_select_keys(groups.oo_etcd_hosts_to_backup)
                                  | oo_collect('inventory_hostname', {'r_etcd_common_backup_complete': true}) }}"
   - set_fact:
-      etcd_backup_failed: "{{ groups.oo_etcd_hosts_to_backup | difference(etcd_backup_completed) }}"
+      etcd_backup_failed: "{{ groups.oo_etcd_hosts_to_backup | difference(etcd_backup_completed) | list }}"
   - fail:
       msg: "Upgrade cannot continue. The following hosts did not complete etcd backup: {{ etcd_backup_failed | join(',') }}"
     when: etcd_backup_failed | length > 0

+ 2 - 2
playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml

@@ -175,7 +175,7 @@
                                  | oo_select_keys(groups.oo_masters_to_config)
                                  | oo_collect('inventory_hostname', {'master_update_complete': true}) }}"
   - set_fact:
-      master_update_failed: "{{ groups.oo_masters_to_config | difference(master_update_completed) }}"
+      master_update_failed: "{{ groups.oo_masters_to_config | difference(master_update_completed) | list }}"
   - fail:
       msg: "Upgrade cannot continue. The following masters did not finish updating: {{ master_update_failed | join(',') }}"
     when: master_update_failed | length > 0
@@ -268,7 +268,7 @@
                                  | oo_select_keys(groups.oo_masters_to_config)
                                  | oo_collect('inventory_hostname', {'reconcile_complete': true}) }}"
   - set_fact:
-      reconcile_failed: "{{ groups.oo_masters_to_config | difference(reconcile_completed) }}"
+      reconcile_failed: "{{ groups.oo_masters_to_config | difference(reconcile_completed) | list }}"
   - fail:
       msg: "Upgrade cannot continue. The following masters did not finish reconciling: {{ reconcile_failed | join(',') }}"
     when: reconcile_failed | length > 0

+ 2 - 2
playbooks/common/openshift-etcd/migrate.yml

@@ -47,7 +47,7 @@
                                  | oo_select_keys(groups.oo_etcd_to_migrate)
                                  | oo_collect('inventory_hostname', {'r_etcd_common_backup_complete': true}) }}"
   - set_fact:
-      etcd_backup_failed: "{{ groups.oo_etcd_to_migrate | difference(etcd_backup_completed) }}"
+      etcd_backup_failed: "{{ groups.oo_etcd_to_migrate | difference(etcd_backup_completed) | list }}"
   - fail:
       msg: "Migration cannot continue. The following hosts did not complete etcd backup: {{ etcd_backup_failed | join(',') }}"
     when:
@@ -113,7 +113,7 @@
                                  | oo_select_keys(groups.oo_etcd_to_migrate)
                                  | oo_collect('inventory_hostname', {'r_etcd_migrate_success': true}) }}"
   - set_fact:
-      etcd_migration_failed: "{{ groups.oo_etcd_to_migrate | difference(etcd_migration_completed) }}"
+      etcd_migration_failed: "{{ groups.oo_etcd_to_migrate | difference(etcd_migration_completed) | list }}"
 
 - name: Add TTLs on the first master
   hosts: oo_first_master[0]