diff --git a/tasks/main.yml b/tasks/main.yml
index a77a65d2..a6c94642 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -45,6 +45,7 @@
     - always
 
 - include: nova_virt_detect.yml
+  static: no
   when: nova_virt_type is not defined
   tags:
     - always
@@ -56,16 +57,16 @@
 - include: nova_init.yml
 
 - include: nova_db_setup.yml
-  when: >
-    inventory_hostname == groups['nova_api_os_compute'][0]
+  static: no
+  when: inventory_hostname == groups['nova_api_os_compute'][0]
 
 - include: nova_service_setup.yml
-  when: >
-    inventory_hostname == groups['nova_api_os_compute'][0]
+  static: no
+  when: inventory_hostname == groups['nova_api_os_compute'][0]
 
 - include: nova_compute.yml
-  when: >
-    inventory_hostname in groups['nova_compute']
+  static: no
+  when: inventory_hostname in groups['nova_compute']
   tags:
     - nova-compute
 
diff --git a/tasks/nova_compute.yml b/tasks/nova_compute.yml
index 8809c86c..123188c9 100644
--- a/tasks/nova_compute.yml
+++ b/tasks/nova_compute.yml
@@ -14,12 +14,15 @@
 # limitations under the License.
 
 - include: nova_compute_kvm.yml
+  static: no
   when: nova_virt_type == 'kvm' or nova_virt_type == 'qemu'
 
 - include: nova_compute_powervm.yml
+  static: no
   when: nova_virt_type == 'powervm'
 
 - include: nova_compute_lxd.yml
+  static: no
   when: nova_virt_type == 'lxd'
 
 - include: nova_compute_key_populate.yml
diff --git a/tasks/nova_console_novnc_install.yml b/tasks/nova_console_novnc_install.yml
index dc2f4394..a7e053c2 100644
--- a/tasks/nova_console_novnc_install.yml
+++ b/tasks/nova_console_novnc_install.yml
@@ -56,7 +56,10 @@
     - nova-pip-packages
 
 - include: nova_console_novnc_ssl.yml
-  when: nova_console_user_ssl_cert is defined and nova_console_user_ssl_key is defined
+  static: no
+  when:
+    - nova_console_user_ssl_cert is defined
+    - nova_console_user_ssl_key is defined
   tags:
     - nova-novnc
     - nova-novnc-ssl
diff --git a/tasks/nova_init_common.yml b/tasks/nova_init_common.yml
index 82d3c6f6..0d4ab57a 100644
--- a/tasks/nova_init_common.yml
+++ b/tasks/nova_init_common.yml
@@ -14,12 +14,14 @@
 # limitations under the License.
 
 - include: nova_init_upstart.yml
+  static: no
   when: pid1_name == "init"
   tags:
     - upstart-init
     - nova-init
 
 - include: nova_init_systemd.yml
+  static: no
   when: pid1_name == "systemd"
   tags:
     - systemd-init
diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml
index 7bf54350..f9b44c40 100644
--- a/tasks/nova_install.yml
+++ b/tasks/nova_install.yml
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 - include: nova_install_apt.yml
-  when:
-    - ansible_pkg_mgr == 'apt'
+  static: no
+  when: ansible_pkg_mgr == 'apt'
 
 - name: Create developer mode constraint file
   copy:
@@ -184,6 +184,7 @@
     - nova-pip-packages
 
 - include: nova_console_spice_install.yml
+  static: no
   when:
     - inventory_hostname in groups['nova_console']
     - nova_console_type == "spice"
@@ -191,6 +192,7 @@
     - nova-spice-console
 
 - include: nova_console_novnc_install.yml
+  static: no
   when:
     - inventory_hostname in groups['nova_console']
     - nova_console_type == "novnc"
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 8e3c1a61..691129be 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -14,6 +14,10 @@
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
   version: master
+- name: openstack_hosts
+  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
+  scm: git
+  version: master
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git