diff --git a/nova/upgrade/verify/_service.sls b/nova/upgrade/verify/_service.sls
index 97d016b..73c279f 100644
--- a/nova/upgrade/verify/_service.sls
+++ b/nova/upgrade/verify/_service.sls
@@ -4,18 +4,16 @@
   test.show_notification:
     - text: "Running nova.upgrade.verify.service"
 
-{%- if compute.get('enabled') %}
+{%- if compute.get('enabled') or controller.get('enabled') %}
 {% set host_id = salt['network.get_hostname']() %}
-{% endif %}
 
 wait_for_service:
   module.run:
     - name: novav21.services_wait
     - cloud_name: admin_identity
     - admin_up_only: False
-{%- if host_id is defined %}
     - host: {{ host_id }}
-{%- endif %}
-    - retries: 20
+    - retries: 30
     - timeout: 10
 
+{% endif %}