Force Ansible to use dynamic includes

Ansible 2.1.1 introduces a regression in the way conditional
includes are handled which results in every task in the
included file being evaluated even if the condition for the
include is not met. This extends the run time significantly
for a deployment.

This patch forces all conditional includes to be dynamic.

Change-Id: Ide463fde793aa044c5288ae50e87a6be771a8e4d
Related-Bug: https://github.com/ansible/ansible/issues/17687

tasks/main.yml

@@ -50,14 +50,14 @@
     - sahara-install
 
 - include: sahara_db_setup.yml
-  when: >
-    inventory_hostname == groups['sahara_all'][0]
+  static: no
+  when: inventory_hostname == groups['sahara_all'][0]
   tags:
     - sahara-install
 
 - include: sahara_service_setup.yml
-  when: >
-    inventory_hostname == groups['sahara_all'][0]
+  static: no
+  when: inventory_hostname == groups['sahara_all'][0]
   tags:
     - sahara-install
 

tasks/sahara_init_common.yml

@@ -12,9 +12,11 @@
 # limitations under the License.
 
 - include: sahara_init_upstart.yml
+  static: no
   when: pid1_name == "init"
 
 - include: sahara_init_systemd.yml
+  static: no
   when: pid1_name == "systemd"
 
 - name: Load service

tasks/sahara_install.yml

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 - include: sahara_install_apt.yml
-  when:
-    - ansible_pkg_mgr == 'apt'
+  static: no
+  when: ansible_pkg_mgr == 'apt'
 
 - name: Create developer mode constraint file
   copy:

tests/ansible-role-requirements.yml

@@ -10,6 +10,10 @@
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
   version: master
+- name: openstack_hosts
+  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
+  scm: git
+  version: master
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git