openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Revert dynamic include for inventory-based conditionals

Browse Source 
Forcing dynamic includes for inventory-based conditionals
results in incomplete execution.

As the install tasks are selective based on the role of
the target host group, the dynamic include needs to be
reverted.

Change-Id: I002a513b062df716c8c4961f3b0df9312094f6cc
This commit is contained in:
Jesse Pretorius 2016-10-01 12:40:58 +01:00 committed by Jesse Pretorius (odyssey4me)
parent f28a3a4893
commit cec9b07062
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/main.yml
View File

@ -80,6 +80,7 @@
- include: neutron_init.yml - include: neutron_init.yml
tags: tags:
- neutron-install - neutron-install
- include: calico_init.yml - include: calico_init.yml
static: no static: no
when: neutron_plugin_type == 'ml2.calico' when: neutron_plugin_type == 'ml2.calico'
@ -87,7 +88,6 @@
- neutron-install - neutron-install
- include: neutron_db_setup.yml - include: neutron_db_setup.yml
static: no
when: when:
- neutron_services['neutron-server']['group'] in group_names - neutron_services['neutron-server']['group'] in group_names
- inventory_hostname == groups[neutron_services['neutron-server']['group']][0] - inventory_hostname == groups[neutron_services['neutron-server']['group']][0]
@ -95,7 +95,6 @@
- neutron-install - neutron-install
- include: neutron_service_setup.yml - include: neutron_service_setup.yml
static: no
when: when:
- "'neutron_all' in group_names" - "'neutron_all' in group_names"
- inventory_hostname == groups['neutron_all'][0] - inventory_hostname == groups['neutron_all'][0]
@ -103,7 +102,6 @@
- neutron-install - neutron-install
- include: neutron_l3_ha.yml - include: neutron_l3_ha.yml
static: no
when: when:
- neutron_services['neutron-l3-agent']['group'] in group_names - neutron_services['neutron-l3-agent']['group'] in group_names
- neutron_legacy_ha_tool_enabled | bool - neutron_legacy_ha_tool_enabled | bool

1
tasks/neutron_install.yml
View File

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
- include: neutron_install-apt.yml - include: neutron_install-apt.yml
static: no
when: ansible_pkg_mgr == 'apt' when: ansible_pkg_mgr == 'apt'
- name: Create developer mode constraint file - name: Create developer mode constraint file