From cec9b070621657f371c39e692ef6237b5d53d0ab Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Sat, 1 Oct 2016 12:40:58 +0100
Subject: [PATCH] Revert dynamic include for inventory-based conditionals

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
---
 tasks/main.yml            | 4 +---
 tasks/neutron_install.yml | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

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