Merge "Make all install actions consistently use with_items"

playbooks/roles/os_aodh/tasks/aodh_install.yml

@@ -37,8 +37,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ aodh_requires_pip_packages }}"
+  with_items: aodh_requires_pip_packages
   tags:
     - aodh-install
     - aodh-pip-packages
@@ -106,8 +105,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ aodh_pip_packages }}"
+  with_items: aodh_pip_packages
   when:
     - aodh_venv_enabled | bool
     - aodh_get_venv | failed
@@ -124,8 +122,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ aodh_pip_packages }}"
+  with_items: aodh_pip_packages
   when: not aodh_venv_enabled | bool
   tags:
     - aodh-install

playbooks/roles/os_ceilometer/tasks/ceilometer_install.yml

@@ -37,8 +37,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ ceilometer_requires_pip_packages }}"
+  with_items: ceilometer_requires_pip_packages
   tags:
     - ceilometer-install
     - ceilometer-pip-packages
@@ -106,8 +105,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ ceilometer_pip_packages }}"
+  with_items: ceilometer_pip_packages
   when:
     - ceilometer_venv_enabled | bool
     - ceilometer_get_venv | failed
@@ -124,8 +122,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ ceilometer_pip_packages }}"
+  with_items: ceilometer_pip_packages
   when: not ceilometer_venv_enabled | bool
   tags:
     - ceilometer-install

playbooks/roles/os_cinder/tasks/cinder_install.yml

@@ -46,8 +46,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ cinder_requires_pip_packages }}"
+  with_items: cinder_requires_pip_packages
   tags:
     - cinder-install
     - cinder-pip-packages
@@ -115,8 +114,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ cinder_pip_packages }}"
+  with_items: cinder_pip_packages
   when:
     - cinder_venv_enabled | bool
     - cinder_get_venv | failed
@@ -133,8 +131,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ cinder_pip_packages }}"
+  with_items: cinder_pip_packages
   when: not cinder_venv_enabled | bool
   tags:
     - cinder-install

playbooks/roles/os_glance/tasks/glance_install.yml

@@ -46,8 +46,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ glance_requires_pip_packages }}"
+  with_items: glance_requires_pip_packages
   tags:
     - glance-install
     - glance-pip-packages
@@ -115,8 +114,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ glance_pip_packages }}"
+  with_items: glance_pip_packages
   when:
     - glance_venv_enabled | bool
     - glance_get_venv | failed
@@ -133,8 +131,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ glance_pip_packages }}"
+  with_items: glance_pip_packages
   when: not glance_venv_enabled | bool
   tags:
     - glance-install

playbooks/roles/os_heat/tasks/heat_install.yml

@@ -46,8 +46,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ heat_requires_pip_packages }}"
+  with_items: heat_requires_pip_packages
   tags:
     - heat-install
     - heat-pip-packages
@@ -115,8 +114,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ heat_pip_packages }}"
+  with_items: heat_pip_packages
   when:
     - heat_venv_enabled | bool
     - heat_get_venv | failed
@@ -133,8 +131,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ heat_pip_packages }}"
+  with_items: heat_pip_packages
   when: not heat_venv_enabled | bool
   tags:
     - heat-install

playbooks/roles/os_horizon/tasks/horizon_install.yml

@@ -48,8 +48,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ horizon_pip_packages }}"
+  with_items: horizon_pip_packages
   when:
     - horizon_venv_enabled | bool
     - horizon_get_venv | failed
@@ -65,8 +64,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ horizon_pip_packages }}"
+  with_items: horizon_pip_packages
   when: not horizon_venv_enabled | bool
   tags:
     - horizon-pip-packages

playbooks/roles/os_keystone/tasks/keystone_install.yml

@@ -74,8 +74,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ keystone_requires_pip_packages }}"
+  with_items: keystone_requires_pip_packages
   tags:
     - keystone-install
     - keystone-pip-packages
@@ -143,8 +142,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ keystone_pip_packages }}"
+  with_items: keystone_pip_packages
   when:
     - keystone_venv_enabled | bool
     - keystone_get_venv | failed
@@ -161,8 +159,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ keystone_pip_packages }}"
+  with_items: keystone_pip_packages
   when: not keystone_venv_enabled | bool
   tags:
     - keystone-install

playbooks/roles/os_neutron/tasks/neutron_install.yml

@@ -75,8 +75,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ neutron_requires_pip_packages }}"
+  with_items: neutron_requires_pip_packages
   tags:
     - neutron-install
     - neutron-pip-packages
@@ -144,8 +143,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ neutron_pip_packages }}"
+  with_items: neutron_pip_packages
   when:
     - neutron_venv_enabled | bool
     - neutron_get_venv | failed
@@ -162,8 +160,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ neutron_pip_packages }}"
+  with_items: neutron_pip_packages
   when: not neutron_venv_enabled | bool
   tags:
     - neutron-install

playbooks/roles/os_nova/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

playbooks/roles/os_nova/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

playbooks/roles/os_nova/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

playbooks/roles/os_swift/tasks/swift_install.yml

@@ -46,8 +46,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ swift_requires_pip_packages }}"
+  with_items: swift_requires_pip_packages
   tags:
     - swift-install
     - swift-pip-packages
@@ -115,8 +114,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ swift_pip_packages }}"
+  with_items: swift_pip_packages
   when:
     - swift_venv_enabled | bool
     - swift_get_venv | failed
@@ -133,9 +131,8 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ swift_pip_packages }}"
+  with_items: swift_pip_packages
   when: not swift_venv_enabled | bool
   tags:
     - swift-install
-    - swift-pip-packages
+    - swift-pip-packages

playbooks/roles/os_tempest/tasks/tempest_install.yml

@@ -22,8 +22,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items:
-    - "{{ tempest_requires_pip_packages }}"
+  with_items: tempest_requires_pip_packages
   tags:
     - tempest-pip-requires-packages
     - tempest-install
@@ -121,8 +120,8 @@
   when:
     - tempest_get_venv | failed
   with_items:
-    - "{{ tempest_pip_packages }}"
-    - "{{ tempest_git_dest }}"
+    - tempest_pip_packages
+    - tempest_git_dest
   tags:
     - tempest-pip-packages
     - tempest-pip-install

tests/roles/bootstrap-host/tasks/install-apt.yml

@@ -72,8 +72,7 @@
   apt:
     name: "{{ item }}"
     state: absent
-  with_items:
-    - "{{ packages_remove }}"
+  with_items: packages_remove
   tags:
     - remove-packages
 
@@ -81,8 +80,7 @@
   apt:
     name: "{{ item }}"
     state: present
-  with_items:
-    - "{{ packages_install }}"
+  with_items: packages_install
   tags:
     - install-packages
 
@@ -90,8 +88,7 @@
   apt:
     name: "{{ item }}"
     state: present
-  with_items:
-    - "{{ packages_mongodb }}"
+  with_items: packages_mongodb
   when: bootstrap_host_mongodb_service | bool
   tags:
     - install-mongodb
@@ -100,8 +97,7 @@
   apt:
     name: "{{ item }}"
     state: present
-  with_items:
-    - "{{ packages_libvirt }}"
+  with_items: packages_libvirt
   when: bootstrap_host_libvirt_config | bool
   tags:
     - install-libvirt