diff --git a/tasks/nova_compute_kvm_install.yml b/tasks/nova_compute_kvm_install.yml
index 996df0d5..d5eab53f 100644
--- a/tasks/nova_compute_kvm_install.yml
+++ b/tasks/nova_compute_kvm_install.yml
@@ -63,7 +63,7 @@
   retries: 5
   delay: 2
   when:
-    - not nova_get_venv | success or nova_developer_mode | bool
+    - nova_get_venv | failed or nova_get_venv | skipped or nova_developer_mode | bool
   tags:
     - nova-install
     - nova-pip-packages
diff --git a/tasks/nova_console_novnc_install.yml b/tasks/nova_console_novnc_install.yml
index 7949107e..69d11a6a 100644
--- a/tasks/nova_console_novnc_install.yml
+++ b/tasks/nova_console_novnc_install.yml
@@ -50,7 +50,7 @@
   retries: 5
   delay: 2
   when:
-    - not nova_get_venv | success or nova_developer_mode | bool
+    - nova_get_venv | failed or nova_get_venv | skipped or nova_developer_mode | bool
   tags:
     - nova-install
     - nova-pip-packages
diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml
index 8fcf2065..ffe39d7d 100644
--- a/tasks/nova_install.yml
+++ b/tasks/nova_install.yml
@@ -220,7 +220,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  when: not nova_get_venv | success or nova_developer_mode | bool
+  when: nova_get_venv | failed or nova_get_venv | skipped or nova_developer_mode | bool
   notify: Restart nova services
   tags:
     - nova-install
@@ -233,14 +233,14 @@
   when:
     - ansible_pkg_mgr == 'yum'
     - not nova_developer_mode | bool
-    - nova_get_venv | changed or nova_venv_dir | changed
+    - nova_get_venv | changed
 
 - name: Update virtualenv path
   command: >
     virtualenv-tools --update-path=auto --reinitialize {{ nova_bin | dirname }}
   when:
     - not nova_developer_mode | bool
-    - nova_get_venv | changed or nova_venv_dir | changed
+    - nova_get_venv | changed
   tags:
     - nova-install
     - nova-pip-packages