From 6480e149eef69d7f8858df96c2065ca833f8f72d Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Thu, 21 Jan 2016 15:40:05 +0000 Subject: [PATCH] Make all install actions consistently use with_items This is primarily a style fix, not a functional one. Related-Bug: #1495748 Change-Id: Ia34e01bced2d0287dab5353f975f36f9323cd205 --- tasks/nova_compute_kvm_install.yml | 6 ++---- tasks/nova_console_novnc_install.yml | 6 ++---- tasks/nova_install.yml | 9 +++------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/tasks/nova_compute_kvm_install.yml b/tasks/nova_compute_kvm_install.yml index ba2564ac..40b6231d 100644 --- a/tasks/nova_compute_kvm_install.yml +++ b/tasks/nova_compute_kvm_install.yml @@ -49,8 +49,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_compute_pip_packages }}" + with_items: nova_compute_pip_packages when: - nova_venv_enabled | bool - nova_get_venv | failed @@ -86,8 +85,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_compute_pip_packages }}" + with_items: nova_compute_pip_packages when: not nova_venv_enabled | bool tags: - nova-install diff --git a/tasks/nova_console_novnc_install.yml b/tasks/nova_console_novnc_install.yml index 9bcab62b..ae569ad9 100644 --- a/tasks/nova_console_novnc_install.yml +++ b/tasks/nova_console_novnc_install.yml @@ -66,8 +66,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_novnc_pip_packages }}" + with_items: nova_novnc_pip_packages when: - nova_venv_enabled | bool - nova_get_venv | failed @@ -84,8 +83,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_novnc_pip_packages }}" + with_items: nova_novnc_pip_packages when: not nova_venv_enabled | bool tags: - nova-install diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml index e5c217e5..4e12004b 100644 --- a/tasks/nova_install.yml +++ b/tasks/nova_install.yml @@ -46,8 +46,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_requires_pip_packages }}" + with_items: nova_requires_pip_packages tags: - nova-install - nova-pip-packages @@ -115,8 +114,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_pip_packages }}" + with_items: nova_pip_packages when: - nova_venv_enabled | bool - nova_get_venv | failed @@ -133,8 +131,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: - - "{{ nova_pip_packages }}" + with_items: nova_pip_packages when: not nova_venv_enabled | bool tags: - nova-install