diff --git a/tasks/main.yml b/tasks/main.yml index 39a766ac..4675fbc6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -80,6 +80,7 @@ - include: neutron_init.yml tags: - neutron-install + - include: calico_init.yml static: no when: neutron_plugin_type == 'ml2.calico' @@ -87,7 +88,6 @@ - neutron-install - include: neutron_db_setup.yml - static: no when: - neutron_services['neutron-server']['group'] in group_names - inventory_hostname == groups[neutron_services['neutron-server']['group']][0] @@ -95,7 +95,6 @@ - neutron-install - include: neutron_service_setup.yml - static: no when: - "'neutron_all' in group_names" - inventory_hostname == groups['neutron_all'][0] @@ -103,7 +102,6 @@ - neutron-install - include: neutron_l3_ha.yml - static: no when: - neutron_services['neutron-l3-agent']['group'] in group_names - neutron_legacy_ha_tool_enabled | bool diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index 1f36e192..043f6ee0 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_install.yml @@ -14,7 +14,6 @@ # limitations under the License. - include: neutron_install-apt.yml - static: no when: ansible_pkg_mgr == 'apt' - name: Create developer mode constraint file