diff --git a/handlers/main.yml b/handlers/main.yml index 57539823..c796fc58 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -18,6 +18,6 @@ name: "{{ item.value.service_name }}" state: restarted pattern: "{{ item.value.service_name }}" - with_dict: neutron_services + with_dict: "{{ neutron_services }}" failed_when: false when: item.value.service_en | bool diff --git a/tasks/neutron_db_setup.yml b/tasks/neutron_db_setup.yml index 06ccf3b9..c075a9e4 100644 --- a/tasks/neutron_db_setup.yml +++ b/tasks/neutron_db_setup.yml @@ -78,7 +78,7 @@ state: stopped pattern: "neutron-server" delegate_to: "{{ item }}" - with_items: groups[neutron_services['neutron-server']['group']] + with_items: "{{ groups[neutron_services['neutron-server']['group']] }}" when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type != 'ml2' tags: - neutron-db-setup @@ -122,7 +122,7 @@ state: started pattern: "neutron-server" delegate_to: "{{ item }}" - with_items: groups[neutron_services['neutron-server']['group']] + with_items: "{{ groups[neutron_services['neutron-server']['group']] }}" when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type != 'ml2' tags: - neutron-db-setup diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index c6b590d3..9a1b199b 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_install.yml @@ -38,7 +38,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: neutron_apt_packages + with_items: "{{ neutron_apt_packages }}" tags: - neutron-install - neutron-apt-packages @@ -51,7 +51,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: neutron_lbaas_apt_packages + with_items: "{{ neutron_lbaas_apt_packages }}" when: - inventory_hostname in groups[neutron_services['neutron-lbaas-agent']['group']] - neutron_lbaas | bool or neutron_lbaasv2 | bool @@ -67,7 +67,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: neutron_vpnaas_apt_packages + with_items: "{{ neutron_vpnaas_apt_packages }}" when: - inventory_hostname in groups[neutron_services['neutron-vpnaas-agent']['group']] - neutron_vpnaas | bool @@ -83,7 +83,7 @@ until: remove_packages|success retries: 5 delay: 2 - with_items: neutron_apt_remove_packages + with_items: "{{ neutron_apt_remove_packages }}" tags: - neutron-install - neutron-apt-packages @@ -258,7 +258,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 or neutron_developer_mode | bool @@ -276,7 +276,7 @@ until: install_packages|success retries: 5 delay: 2 - with_items: neutron_pip_packages + with_items: "{{ neutron_pip_packages }}" when: - not neutron_developer_mode | bool - not neutron_venv_enabled | bool diff --git a/tasks/neutron_post_install.yml b/tasks/neutron_post_install.yml index 055ab1cf..be2220d5 100644 --- a/tasks/neutron_post_install.yml +++ b/tasks/neutron_post_install.yml @@ -75,7 +75,7 @@ mode: "0644" config_overrides: "{{ item.value.config_overrides }}" config_type: "{{ item.value.config_type }}" - with_dict: neutron_services + with_dict: "{{ neutron_services }}" notify: - Restart neutron services when: @@ -112,7 +112,7 @@ dest: "/etc/neutron/{{ item.value.service_rootwrap }}" owner: "root" group: "root" - with_dict: neutron_services + with_dict: "{{ neutron_services }}" when: - item.value.service_en | bool - item.value.service_rootwrap is defined