From 8e6bf7a36c794abf3e1c3ab847ad08082bac0a8c Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 11 Jan 2017 08:30:16 -0600 Subject: [PATCH] Additional fix for venv build fallback Additional fixes needed to fix the venv build fallback behavior were found after Id41233789047906a0eb5f1af4d0d6b4dde55d8c7 merged. Change-Id: I5c4b375dc22e846de1372c6bc0ababf5fbc20de5 --- tasks/nova_compute_kvm_install.yml | 2 +- tasks/nova_console_novnc_install.yml | 2 +- tasks/nova_install.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) 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