From ac5913b888f0430355622852406ad70edaea49b1 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Mon, 26 Sep 2016 19:26:59 +0100
Subject: [PATCH] Revert dynamic includes for inventory-based conditionals

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

Change-Id: Icfa639ce364d6c42306bbf6bbfd8f5d3ab65994a
---
 tasks/main.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index d673d238..261e8d66 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -51,7 +51,6 @@
     - cinder-config
 
 - include: cinder_db_setup.yml
-  static: no
   when:
     - groups['cinder_all'] | length > 0
     - inventory_hostname == groups['cinder_all'][0]
@@ -59,7 +58,6 @@
     - cinder-install
 
 - include: cinder_service_setup.yml
-  static: no
   when:
     - groups['cinder_all'] | length > 0
     - inventory_hostname == groups['cinder_all'][0]
@@ -74,7 +72,6 @@
   meta: flush_handlers
 
 - include: cinder_backends.yml
-  static: no
   when:
     - groups['cinder_volume'] | length > 0
     - inventory_hostname in groups['cinder_volume'][0]
@@ -82,7 +79,6 @@
     - cinder-install
 
 - include: cinder_lvm_config.yml
-  static: no
   when:
     - inventory_hostname in groups['cinder_volume']
     - cinder_backend_lvm_inuse