Merge "Set number_of_controllers to 1 if no Controller"

roles/overcloud-deploy/tasks/pre-deploy.yml

@@ -95,15 +95,18 @@
 - name: extract the number of controllers to be deployed
   set_fact:
     number_of_controllers: "{{ deploy_args| regex_replace('^.*--control-scale +([0-9]+).*$', '\\1') | regex_replace('^[^ 0-9]+$', '1') }}"
-  when:
-    - topology_map is not defined
+  when: topology_map is not defined
 
 - name: extract the number of controllers to be deployed (from topology_map)
   set_fact:
-    number_of_controllers: "{{ topology_map.Controller.scale }}"
+    number_of_controllers: |-
+      {% if topology_map.Controller is defined -%}
+      {{ topology_map.Controller.scale }}
+      {%- else -%}
+      1
+      {%- endif %}
   when:
     - topology_map is defined
-    - topology_map.Controller is defined
 
 - name: Set cinder-backup
   set_fact: