Convert include to either import_playbook or include_tasks

This change resolves the deprecation warnings for the use of "include"
which has been removed upstream. Playbooks will now use "import_playbook"
and tasks will now use "include_tasks". While this change attempts to
resolve all of the include issues several playbooks will need to be
refactored to resolve the use of include with variables as this is not
a pattern that is supported by mainline ansible.

Change-Id: I8fdb2f9f75f38986ba1dc9f93e274749c49e5c67
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

playbooks/common-playbooks/cinder.yml

@@ -29,7 +29,7 @@
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain
     # the load balancer back end for this container.
-    - include: ../common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: ../common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: cinder_api-back
         haproxy_state: disabled
@@ -38,13 +38,12 @@
         - "groups['cinder_api'] | length > 1"
 
     - name: Determine storage bridge IP address
-      include: ../common-tasks/dynamic-address-fact.yml
+      include_tasks: ../common-tasks/dynamic-address-fact.yml
       vars:
         network_address: "storage_address"
 
     - name: Configure container (cinder-volume) when lvm is in-use
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       vars:
         extra_container_config:
           - "lxc.autodev=0"
@@ -58,21 +57,19 @@
         - "cinder_backend_lvm_inuse | bool"
 
     - name: Configure container (other services)
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when:
         - "not is_metal"
         - "not ( 'cinder_volume' in group_names and cinder_backend_lvm_inuse | bool )"
 
     - name: Configure log directories (on metal)
-      include: ../common-tasks/os-log-dir-setup.yml
+      include_tasks: ../common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-cinder"
             dest: "/var/log/cinder"
 
-    - include: ../common-tasks/unbound-clients.yml
+    - include_tasks: ../common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
@@ -117,7 +114,7 @@
     # Now that container changes are done, we can set
     # the load balancer back end for this container
     # to available again.
-    - include: ../common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: ../common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: cinder_api-back
         haproxy_state: enabled

playbooks/common-playbooks/glance.yml

@@ -28,7 +28,7 @@
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain
     # the load balancer back end for this container.
-    - include: ../common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: ../common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: glance_api-back
         haproxy_state: disabled
@@ -37,31 +37,28 @@
         - "groups['glance_api'] | length > 1"
 
     - name: Configure container (non-nfs)
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       vars:
         list_of_bind_mounts: "{{ glance_container_bind_mounts }}"
-      static: no
       when:
         - not is_metal
         - glance_default_store == "file"
         - (glance_nfs_client is not defined) or (glance_nfs_client | length == 0)
 
     - name: Configure container (nfs)
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when:
         - not is_metal
         - (glance_default_store != "file") or (glance_nfs_client is defined)
 
     - name: Configure log directories (on metal)
-      include: ../common-tasks/os-log-dir-setup.yml
+      include_tasks: ../common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-glance"
             dest: "/var/log/glance"
 
-    - include: ../common-tasks/unbound-clients.yml
+    - include_tasks: ../common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
@@ -81,7 +78,7 @@
     # Now that container changes are done, we can set
     # the load balancer back end for this container
     # to available again.
-    - include: ../common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: ../common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: glance_api-back
         haproxy_state: enabled

playbooks/common-playbooks/neutron.yml

@@ -26,12 +26,12 @@
   pre_tasks:
 
     - name: Determine tunnel bridge IP address
-      include: ../common-tasks/dynamic-address-fact.yml
+      include_tasks: ../common-tasks/dynamic-address-fact.yml
       vars:
         network_address: "tunnel_address"
 
     - name: Configure container (neutron-agent)
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       vars:
         list_of_bind_mounts:
           - bind_dir_path: "{{ (ansible_pkg_mgr == 'apt') | ternary('/lib/modules', '/usr/lib/modules') }}"
@@ -40,26 +40,25 @@
           - "lxc.cgroup.devices.allow=a *:* rmw"
         extra_container_config_no_restart:
           - "lxc.start.order=29"
-      static: no
       when:
         - "not is_metal"
         - "'neutron_agent' in group_names"
 
     - name: Configure container (other services)
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       when:
         - "not is_metal"
         - "'neutron_agent' not in group_names"
 
     - name: Configure log directories (on metal)
-      include: ../common-tasks/os-log-dir-setup.yml
+      include_tasks: ../common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-neutron"
             dest: "/var/log/neutron"
 
     - name: Configure log directories (on metal) (calico)
-      include: ../common-tasks/os-log-dir-setup.yml
+      include_tasks: ../common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-calico"
@@ -67,8 +66,7 @@
       when:
         - "'neutron_calico_dhcp_agent' in group_names"
 
-    - include: ../common-tasks/unbound-clients.yml
+    - include_tasks: ../common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/common-playbooks/nova.yml

@@ -44,7 +44,7 @@
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain
     # the load balancer back end for this container.
-    - include: ../common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: ../common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: "{{ backend_name }}-back"
         haproxy_state: disabled
@@ -60,27 +60,25 @@
         - "nova_console"
 
     - name: Determine management bridge IP address
-      include: ../common-tasks/dynamic-address-fact.yml
+      include_tasks: ../common-tasks/dynamic-address-fact.yml
       vars:
         network_address: "management_address"
 
     - name: Configure container
-      include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
       vars:
         extra_container_config_no_restart:
           - "lxc.start.order=39"
 
     - name: Configure log directories (on metal)
-      include: ../common-tasks/os-log-dir-setup.yml
+      include_tasks: ../common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-nova"
             dest: "/var/log/nova"
 
-    - include: ../common-tasks/unbound-clients.yml
+    - include_tasks: ../common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
@@ -175,7 +173,7 @@
     # Now that container changes are done, we can set
     # the load balancer back end for this container
     # to available again.
-    - include: ../common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: ../common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: "{{ backend_name }}-back"
         haproxy_state: enabled

playbooks/containers-deploy.yml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: "containers-lxc-host.yml"
+- import_playbook: "containers-lxc-host.yml"
-- include: "containers-lxc-create.yml"
+- import_playbook: "containers-lxc-create.yml"
-- include: "containers-nspawn-host.yml"
+- import_playbook: "containers-nspawn-host.yml"
-- include: "containers-nspawn-create.yml"
+- import_playbook: "containers-nspawn-create.yml"

playbooks/containers-lxc-create.yml

@@ -71,9 +71,9 @@
   tags:
     - lxc-containers-create
   pre_tasks:
-    - include: common-tasks/package-cache-proxy.yml
+    - include_tasks: common-tasks/package-cache-proxy.yml
       when: install_method == "source"
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
       when: install_method == "source"
   roles:
     - role: "openstack_hosts"

playbooks/containers-lxc-host.yml

@@ -24,7 +24,7 @@
   tags:
     - lxc-hosts
   pre_tasks:
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
       when: install_method == "source"
     - name: Check the state of the default LXC service log directory
       stat:

playbooks/containers-nspawn-create.yml

@@ -108,10 +108,10 @@
       setup:
         gather_subset: "network,hardware,virtual"
 
-    - include: common-tasks/package-cache-proxy.yml
+    - include_tasks: common-tasks/package-cache-proxy.yml
       when: install_method == "source"
 
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
       when: install_method == "source"
   roles:
     - role: "openstack_hosts"

playbooks/etcd-install.yml

@@ -18,11 +18,9 @@
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/galera-install.yml

@@ -19,20 +19,18 @@
   serial: 1
   user: root
   tasks:
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-mysql_logs"
             dest: "/var/log/mysql_logs"
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
       vars:
         list_of_bind_mounts: "{{ galera_container_bind_mounts }}"
         extra_container_config_no_restart:
           - "lxc.start.order=10"
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   environment: "{{ deployment_environment_variables | default({}) }}"
@@ -47,12 +45,10 @@
   roles:
     - role: haproxy_endpoints
       haproxy_state: disabled
-      static: no
       when: "groups['haproxy'] | default([]) | length > 0"
     - role: "galera_server"
     - role: haproxy_endpoints
       haproxy_state: enabled
-      static: no
       when: "groups['haproxy'] | default([]) | length > 0"
     - role: "system_crontab_coordination"
       tags:

playbooks/haproxy-install.yml

@@ -19,16 +19,14 @@
   serial: "50%"
   user: root
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-haproxy"
             dest: "/var/log/haproxy"
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
     - name: Remove legacy haproxy configuration files

playbooks/memcached-install.yml

@@ -18,16 +18,14 @@
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-memcached"
             dest: "/var/log/memcached"
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/openstack-hosts-setup.yml

@@ -50,9 +50,9 @@
             (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['15', '42'])
         msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic),  CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X"
 
-    - include: common-tasks/package-cache-proxy.yml
+    - include_tasks: common-tasks/package-cache-proxy.yml
       when: install_method == "source"
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
       when: install_method == "source"
   roles:
     - role: "openstack_hosts"

playbooks/os-aodh-install.yml

@@ -23,18 +23,16 @@
   tags:
     - aodh
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-aodh"
             dest: "/var/log/aodh"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-barbican-install.yml

@@ -23,18 +23,16 @@
   tags:
     - barbican
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-barbican"
             dest: "/var/log/barbican"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-ceilometer-install.yml

@@ -20,17 +20,15 @@
   vars_files:
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-ceilometer"
             dest: "/var/log/ceilometer"
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-congress-install.yml

@@ -24,24 +24,22 @@
   tags:
     - congress
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
     - name: Configure log directories (on metal)
-      include: common-tasks/os-log-dir-setup.yml
+      include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-congress"
             dest: "/var/log/congress"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
     - name: Configure package proxy cache
-      include: common-tasks/package-cache-proxy.yml
+      include_tasks: common-tasks/package-cache-proxy.yml
       when: install_method == "source"
 
   roles:

playbooks/os-designate-install.yml

@@ -26,18 +26,16 @@
   tags:
     - designate
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-designate"
             dest: "/var/log/designate"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-gnocchi-install.yml

@@ -22,29 +22,26 @@
   tags:
     - gnocchi
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       vars:
         list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}"
-      static: no
       when:
         - (gnocchi_storage_driver == "file") or (gnocchi_storage_driver is not defined)
         - not is_metal
 
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when:
         - not is_metal
         - gnocchi_storage_driver is defined
         - gnocchi_storage_driver != "file"
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-gnocchi"
             dest: "/var/log/gnocchi"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-heat-install.yml

@@ -24,18 +24,16 @@
     - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-heat"
             dest: "/var/log/heat"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-horizon-install.yml

@@ -23,17 +23,15 @@
   tags:
     - horizon
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-horizon"
             dest: "/var/log/horizon"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-ironic-install.yml

@@ -23,12 +23,10 @@
   tags:
     - ironic
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-keystone-install.yml

@@ -46,29 +46,27 @@
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain
     # the load balancer back end for this container.
-    - include: common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: "keystone_service-back"
         haproxy_state: disabled
       when: "groups['keystone_all'] | length > 1"
 
     - name: Configure container
-      include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+      include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
       vars:
         extra_container_config_no_restart:
           - "lxc.start.order=19"
-      static: no
       when: not is_metal
 
     - name: Configure log directories (on metal)
-      include: common-tasks/os-log-dir-setup.yml
+      include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-keystone"
             dest: "/var/log/keystone"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
@@ -88,7 +86,7 @@
     # Now that container changes are done, we can set
     # the load balancer back end for this container
     # to available again.
-    - include: common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_backend: "keystone_service-back"
         haproxy_state: enabled

playbooks/os-magnum-install.yml

@@ -25,18 +25,16 @@
   tags:
     - magnum
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-magnum"
             dest: "/var/log/magnum"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-octavia-install.yml

@@ -23,18 +23,16 @@
   tags:
     - octavia
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-octavia"
             dest: "/var/log/octavia"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-rally-install.yml

@@ -23,8 +23,7 @@
   tags:
     - rally
   pre_tasks:
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-sahara-install.yml

@@ -21,18 +21,16 @@
   tags:
     - sahara
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-sahara"
             dest: "/var/log/sahara"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-swift-install.yml

@@ -20,20 +20,18 @@
   vars_files:
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       vars:
         extra_container_config_no_restart:
           - "lxc.start.order=39"
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-swift"
             dest: "/var/log/swift"
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-tacker-install.yml

@@ -23,11 +23,10 @@
   tags:
     - tacker
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-tacker"

playbooks/os-trove-install.yml

@@ -26,18 +26,16 @@
   tags:
     - trove
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-trove"
             dest: "/var/log/trove"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/rabbitmq-install.yml

@@ -19,15 +19,13 @@
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       vars:
         extra_container_config_no_restart:
           - "lxc.start.order=19"
       when: not is_metal
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/repo-build.yml

@@ -51,7 +51,7 @@
   serial: 1
   pre_tasks:
 
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
 
     - name: Load local packages
       debug:

playbooks/repo-install.yml

@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: repo-server.yml
+- import_playbook: repo-server.yml
-- include: repo-build.yml
+- import_playbook: repo-build.yml

playbooks/repo-server.yml

@@ -19,7 +19,7 @@
   user: root
   pre_tasks:
 
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
 
     - name: Check if the git cache exists on deployment host
       local_action:
@@ -28,16 +28,14 @@
       register: _local_git_cache
       when: repo_build_git_cache is defined
 
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       vars:
         list_of_bind_mounts:
           - mount_path: "/openstack/{{ inventory_hostname }}"
             bind_dir_path: "/var/www"
       when: not is_metal
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/repo-use.yml

@@ -26,7 +26,7 @@
     - always
     - repo-config
   pre_tasks:
-    - include: common-tasks/package-cache-proxy.yml
+    - include_tasks: common-tasks/package-cache-proxy.yml
-    - include: common-tasks/set-pip-vars.yml
+    - include_tasks: common-tasks/set-pip-vars.yml
   roles:
     - pip_install

playbooks/rsyslog-install.yml

@@ -24,8 +24,7 @@
       when:
         - not rsyslog_server_enabled | bool
 
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       vars:
         list_of_bind_mounts:
           - bind_dir_path: "{{ rsyslog_server_storage_directory }}"
@@ -34,8 +33,7 @@
           - "lxc.start.order=19"
       when: not is_metal
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/setup-everything.yml

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: setup-hosts.yml
+- import_playbook: setup-hosts.yml
-- include: setup-infrastructure.yml
+- import_playbook: setup-infrastructure.yml
-- include: setup-openstack.yml
+- import_playbook: setup-openstack.yml

playbooks/setup-hosts.yml

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: openstack-hosts-setup.yml
+- import_playbook: openstack-hosts-setup.yml
-- include: security-hardening.yml
+- import_playbook: security-hardening.yml
-- include: containers-deploy.yml
+- import_playbook: containers-deploy.yml

playbooks/setup-infrastructure.yml

@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: unbound-install.yml
+- import_playbook: unbound-install.yml
-- include: repo-install.yml
+- import_playbook: repo-install.yml
   when: install_method == "source"
-- include: haproxy-install.yml
+- import_playbook: haproxy-install.yml
 # TODO(evrardjp): Remove the following when repo_build is done
 # before lxc_container_create, and haproxy is moved with it as
 # second step.
-- include: repo-use.yml
+- import_playbook: repo-use.yml
   when: install_method == "source"
-- include: utility-install.yml
+- import_playbook: utility-install.yml
-- include: memcached-install.yml
+- import_playbook: memcached-install.yml
-- include: galera-install.yml
+- import_playbook: galera-install.yml
-- include: rabbitmq-install.yml
+- import_playbook: rabbitmq-install.yml
-- include: etcd-install.yml
+- import_playbook: etcd-install.yml
-- include: ceph-install.yml
+- import_playbook: ceph-install.yml
-- include: rsyslog-install.yml
+- import_playbook: rsyslog-install.yml
-- include: infra-journal-remote.yml
+- import_playbook: infra-journal-remote.yml

playbooks/setup-openstack.yml

@@ -13,38 +13,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: os-keystone-install.yml
+- import_playbook: os-keystone-install.yml
-- include: os-barbican-install.yml
+- import_playbook: os-barbican-install.yml
-- include: os-glance-install.yml
+- import_playbook: os-glance-install.yml
-- include: os-cinder-install.yml
+- import_playbook: os-cinder-install.yml
-- include: os-nova-install.yml
+- import_playbook: os-nova-install.yml
-- include: os-neutron-install.yml
+- import_playbook: os-neutron-install.yml
-- include: os-heat-install.yml
+- import_playbook: os-heat-install.yml
-- include: os-horizon-install.yml
+- import_playbook: os-horizon-install.yml
-- include: os-designate-install.yml
+- import_playbook: os-designate-install.yml
 #NOTE(stevelle) Ensure Gnocchi identities exist before Swift
-- include: os-gnocchi-install.yml
+- import_playbook: os-gnocchi-install.yml
   when:
     - gnocchi_storage_driver is defined
     - gnocchi_storage_driver == 'swift'
   vars:
     gnocchi_identity_only: True
-- include: os-swift-install.yml
+- import_playbook: os-swift-install.yml
-- include: os-gnocchi-install.yml
+- import_playbook: os-gnocchi-install.yml
-- include: os-ceilometer-install.yml
+- import_playbook: os-ceilometer-install.yml
-- include: os-aodh-install.yml
+- import_playbook: os-aodh-install.yml
-- include: os-ironic-install.yml
+- import_playbook: os-ironic-install.yml
-- include: os-magnum-install.yml
+- import_playbook: os-magnum-install.yml
-- include: os-trove-install.yml
+- import_playbook: os-trove-install.yml
-- include: os-sahara-install.yml
+- import_playbook: os-sahara-install.yml
-- include: os-octavia-install.yml
+- import_playbook: os-octavia-install.yml
-- include: os-tacker-install.yml
+- import_playbook: os-tacker-install.yml
-- include: os-blazar-install.yml
+- import_playbook: os-blazar-install.yml
 
 # This is not an OpenStack service, but integrates with Keystone and must be
 # deployed afterward.
-- include: ceph-rgw-install.yml
+- import_playbook: ceph-rgw-install.yml
-- include: os-congress-install.yml
+- import_playbook: os-congress-install.yml
-- include: os-tempest-install.yml
+- import_playbook: os-tempest-install.yml
   when: (tempest_install | default(False)) | bool or (tempest_run | default(False)) | bool
 

playbooks/unbound-install.yml

@@ -19,9 +19,8 @@
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
   roles:
     - role: "unbound"
@@ -39,8 +38,7 @@
     - "{{ openstack_host_group|default('hosts') }}"
   user: root
   tasks:
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   environment: "{{ deployment_environment_variables | default({}) }}"

playbooks/utility-install.yml

@@ -23,18 +23,16 @@
   tags:
     - utility
   pre_tasks:
-    - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
+    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
-      static: no
       when: not is_metal
 
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-utility"
             dest: "/var/log/utility"
 
-    - include: common-tasks/unbound-clients.yml
+    - include_tasks: common-tasks/unbound-clients.yml
-      static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool