Merge pull request #8317 from jmontleon/fix-upgrade

upgrade from 3.9 w/o ASB to 3.10 with ASB fails

roles/ansible_service_broker/tasks/upgrade.yml

@@ -6,8 +6,10 @@
     namespace: openshift-ansible-service-broker
   register: broker_configmap_raw
 
+- set_fact:
+    broker_configmap: '{{ (broker_configmap_raw.results.results.0.data | from_yaml)["broker-config"] | from_yaml }}'
+  when: broker_configmap_raw.results.results.0.data is defined
+
 - name: Migrate from etcd to CRDs
   import_tasks: migrate.yml
-  when: broker_configmap.dao.get('type') != 'crd'
-  vars:
-    broker_configmap: '{{ (broker_configmap_raw.results.results.0.data | from_yaml)["broker-config"] | from_yaml }}'
+  when: broker_configmap is defined and broker_configmap.dao.get('type') != 'crd'