Include Deprecation - openshift-master

30 files changed, 74 insertions, 78 deletions

diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 52438bdc4..d08c6e940 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -85,10 +85,10 @@
   - include: "{{ openshift_master_upgrade_hook }}"
     when: openshift_master_upgrade_hook is defined
 
-  - include: ../../../openshift-master/private/restart_hosts.yml
+  - include: ../../../openshift-master/private/tasks/restart_hosts.yml
     when: openshift.common.rolling_restart_mode == 'system'
 
-  - include: ../../../openshift-master/private/restart_services.yml
+  - include: ../../../openshift-master/private/tasks/restart_services.yml
     when: openshift.common.rolling_restart_mode == 'services'
 
   # Run the post-upgrade hook if defined:
diff --git a/playbooks/openshift-master/additional_config.yml b/playbooks/openshift-master/additional_config.yml
index e43e9e002..8105f7f88 100644
--- a/playbooks/openshift-master/additional_config.yml
+++ b/playbooks/openshift-master/additional_config.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/additional_config.yml
+- import_playbook: private/additional_config.yml
diff --git a/playbooks/openshift-master/certificates.yml b/playbooks/openshift-master/certificates.yml
index 0384877d9..7ae87c09a 100644
--- a/playbooks/openshift-master/certificates.yml
+++ b/playbooks/openshift-master/certificates.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/certificates.yml
+- import_playbook: private/certificates.yml
diff --git a/playbooks/openshift-master/config.yml b/playbooks/openshift-master/config.yml
index 8ee57ce8d..c7814207c 100644
--- a/playbooks/openshift-master/config.yml
+++ b/playbooks/openshift-master/config.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/config.yml
+- import_playbook: private/config.yml
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml
index 6b0fd6b7c..afb8d6bd1 100644
--- a/playbooks/openshift-master/private/config.yml
+++ b/playbooks/openshift-master/private/config.yml
@@ -11,7 +11,7 @@
           status: "In Progress"
           start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- include: certificates.yml
+- import_playbook: certificates.yml
 
 - name: Disable excluders
   hosts: oo_masters_to_config
@@ -229,7 +229,7 @@
   hosts: oo_masters
   serial: 1
   tasks:
-  - include: tasks/wire_aggregator.yml
+  - include_tasks: tasks/wire_aggregator.yml
 
 - name: Re-enable excluder if it was previously enabled
   hosts: oo_masters_to_config
diff --git a/playbooks/openshift-master/private/restart.yml b/playbooks/openshift-master/private/restart.yml
index 4d73b8124..5cb284935 100644
--- a/playbooks/openshift-master/private/restart.yml
+++ b/playbooks/openshift-master/private/restart.yml
@@ -1,5 +1,5 @@
 ---
-- include: validate_restart.yml
+- import_playbook: validate_restart.yml
 
 - name: Restart masters
   hosts: oo_masters_to_config
@@ -7,13 +7,12 @@
     openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}"
   serial: 1
   handlers:
-  - include: ../../../roles/openshift_master/handlers/main.yml
-    static: yes
+  - import_tasks: ../../../roles/openshift_master/handlers/main.yml
   roles:
   - openshift_facts
   post_tasks:
-  - include: restart_hosts.yml
+  - include_tasks: tasks/restart_hosts.yml
     when: openshift_rolling_restart_mode | default('services') == 'system'
 
-  - include: restart_services.yml
+  - include_tasks: tasks/restart_services.yml
     when: openshift_rolling_restart_mode | default('services') == 'services'
diff --git a/playbooks/openshift-master/private/scaleup.yml b/playbooks/openshift-master/private/scaleup.yml
index 021399965..8229eccfa 100644
--- a/playbooks/openshift-master/private/scaleup.yml
+++ b/playbooks/openshift-master/private/scaleup.yml
@@ -44,14 +44,14 @@
     delay: 1
     changed_when: false
 
-- include: set_network_facts.yml
+- import_playbook: set_network_facts.yml
 
-- include: ../../openshift-etcd/private/certificates.yml
+- import_playbook: ../../openshift-etcd/private/certificates.yml
 
-- include: config.yml
+- import_playbook: config.yml
 
-- include: ../../openshift-loadbalancer/private/config.yml
+- import_playbook: ../../openshift-loadbalancer/private/config.yml
 
-- include: ../../openshift-node/private/certificates.yml
+- import_playbook: ../../openshift-node/private/certificates.yml
 
-- include: ../../openshift-node/private/config.yml
+- import_playbook: ../../openshift-node/private/config.yml
diff --git a/playbooks/openshift-master/private/restart_hosts.yml b/playbooks/openshift-master/private/tasks/restart_hosts.yml
index a5dbe0590..a5dbe0590 100644
--- a/playbooks/openshift-master/private/restart_hosts.yml
+++ b/playbooks/openshift-master/private/tasks/restart_hosts.yml
diff --git a/playbooks/openshift-master/private/restart_services.yml b/playbooks/openshift-master/private/tasks/restart_services.yml
index 4e1b3a3be..4e1b3a3be 100644
--- a/playbooks/openshift-master/private/restart_services.yml
+++ b/playbooks/openshift-master/private/tasks/restart_services.yml
diff --git a/playbooks/openshift-master/restart.yml b/playbooks/openshift-master/restart.yml
index 5e28e274e..041c1384d 100644
--- a/playbooks/openshift-master/restart.yml
+++ b/playbooks/openshift-master/restart.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/restart.yml
+- import_playbook: private/restart.yml
diff --git a/playbooks/openshift-master/scaleup.yml b/playbooks/openshift-master/scaleup.yml
index aa0dd8094..f717cd0e9 100644
--- a/playbooks/openshift-master/scaleup.yml
+++ b/playbooks/openshift-master/scaleup.yml
@@ -1,5 +1,5 @@
 ---
-- include: ../init/evaluate_groups.yml
+- import_playbook: ../init/evaluate_groups.yml
 
 - name: Ensure there are new_masters or new_nodes
   hosts: localhost
@@ -18,6 +18,6 @@
 
 # Need a better way to do the above check for node without
 # running evaluate_groups and init/main.yml
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/scaleup.yml
+- import_playbook: private/scaleup.yml
diff --git a/roles/cockpit/tasks/main.yml b/roles/cockpit/tasks/main.yml
index 066ee3f3b..34754502a 100644
--- a/roles/cockpit/tasks/main.yml
+++ b/roles/cockpit/tasks/main.yml
@@ -1,7 +1,6 @@
 ---
 - name: setup firewall
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
 
 - name: Install cockpit-ws
   package: name={{ item }} state=present
diff --git a/roles/contiv/tasks/main.yml b/roles/contiv/tasks/main.yml
index 40a0f9e61..cb9196a71 100644
--- a/roles/contiv/tasks/main.yml
+++ b/roles/contiv/tasks/main.yml
@@ -5,10 +5,10 @@
     recurse: yes
     state: directory
 
-- include: download_bins.yml
+- include_tasks: download_bins.yml
 
-- include: netmaster.yml
+- include_tasks: netmaster.yml
   when: contiv_role == "netmaster"
 
-- include: netplugin.yml
+- include_tasks: netplugin.yml
   when: contiv_role == "netplugin"
diff --git a/roles/contiv/tasks/netmaster.yml b/roles/contiv/tasks/netmaster.yml
index cc52d3a43..6f15af8c2 100644
--- a/roles/contiv/tasks/netmaster.yml
+++ b/roles/contiv/tasks/netmaster.yml
@@ -1,8 +1,8 @@
 ---
-- include: netmaster_firewalld.yml
+- include_tasks: netmaster_firewalld.yml
   when: has_firewalld
 
-- include: netmaster_iptables.yml
+- include_tasks: netmaster_iptables.yml
   when: not has_firewalld and has_iptables
 
 - name: Netmaster | Check is /etc/hosts file exists
@@ -70,8 +70,8 @@
     state: started
   register: netmaster_started
 
-- include: aci.yml
+- include_tasks: aci.yml
   when: contiv_fabric_mode == "aci"
 
-- include: default_network.yml
+- include_tasks: default_network.yml
   when: contiv_default_network == true
diff --git a/roles/contiv/tasks/netplugin.yml b/roles/contiv/tasks/netplugin.yml
index e861a2591..0b2f91bab 100644
--- a/roles/contiv/tasks/netplugin.yml
+++ b/roles/contiv/tasks/netplugin.yml
@@ -1,8 +1,8 @@
 ---
-- include: netplugin_firewalld.yml
+- include_tasks: netplugin_firewalld.yml
   when: has_firewalld
 
-- include: netplugin_iptables.yml
+- include_tasks: netplugin_iptables.yml
   when: has_iptables
 
 - name: Netplugin | Ensure localhost entry correct in /etc/hosts
@@ -19,7 +19,7 @@
     line: '::1 '
     state: absent
 
-- include: ovs.yml
+- include_tasks: ovs.yml
   when: netplugin_driver == "ovs"
 
 - name: Netplugin | Create Netplugin bin symlink
diff --git a/roles/contiv/tasks/ovs.yml b/roles/contiv/tasks/ovs.yml
index 0c1b994c7..5c92e90e9 100644
--- a/roles/contiv/tasks/ovs.yml
+++ b/roles/contiv/tasks/ovs.yml
@@ -1,5 +1,5 @@
 ---
-- include: packageManagerInstall.yml
+- include_tasks: packageManagerInstall.yml
   when: source_type == "packageManager"
   tags:
     - binary-update
diff --git a/roles/contiv/tasks/packageManagerInstall.yml b/roles/contiv/tasks/packageManagerInstall.yml
index e0d48e643..d5726476c 100644
--- a/roles/contiv/tasks/packageManagerInstall.yml
+++ b/roles/contiv/tasks/packageManagerInstall.yml
@@ -3,7 +3,7 @@
   set_fact:
     did_install: false
 
-- include: pkgMgrInstallers/centos-install.yml
+- include_tasks: pkgMgrInstallers/centos-install.yml
   when: (ansible_os_family == "RedHat") and
         not is_atomic
 
diff --git a/roles/contiv_facts/tasks/main.yml b/roles/contiv_facts/tasks/main.yml
index 7a4972fca..3267a4ab0 100644
--- a/roles/contiv_facts/tasks/main.yml
+++ b/roles/contiv_facts/tasks/main.yml
@@ -81,8 +81,8 @@
     has_iptables: false
 
 # collect information about what packages are installed
-- include: rpm.yml
+- include_tasks: rpm.yml
   when: has_rpm
 
-- include: fedora-install.yml
+- include_tasks: fedora-install.yml
   when: not is_atomic and ansible_distribution == "Fedora"
diff --git a/roles/kuryr/tasks/master.yaml b/roles/kuryr/tasks/master.yaml
index 55ab16f74..1cc6d2375 100644
--- a/roles/kuryr/tasks/master.yaml
+++ b/roles/kuryr/tasks/master.yaml
@@ -1,6 +1,6 @@
 ---
-- name: Perform OpenShit ServiceAccount config
-  include: serviceaccount.yaml
+- name: Perform OpenShift ServiceAccount config
+  include_tasks: serviceaccount.yaml
 
 - name: Create kuryr manifests tempdir
   command: mktemp -d
diff --git a/roles/nuage_master/tasks/main.yaml b/roles/nuage_master/tasks/main.yaml
index f3c487132..c264427de 100644
--- a/roles/nuage_master/tasks/main.yaml
+++ b/roles/nuage_master/tasks/main.yaml
@@ -1,7 +1,6 @@
 ---
 - name: setup firewall
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
 
 - name: Set the Nuage certificate directory fact for Atomic hosts
   set_fact:
@@ -62,7 +61,7 @@
   become: yes
   file: path={{ nuage_mon_rest_server_logdir }} state=directory
 
-- include: serviceaccount.yml
+- include_tasks: serviceaccount.yml
 
 - name: Download the certs and keys
   become: yes
@@ -82,7 +81,7 @@
     - nuage.key
     - nuage.kubeconfig
 
-- include: certificates.yml
+- include_tasks: certificates.yml
 
 - name: Install Nuage VSD user certificate
   become: yes
diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml
index ab3055c8b..dff492a69 100644
--- a/roles/openshift_cloud_provider/tasks/main.yml
+++ b/roles/openshift_cloud_provider/tasks/main.yml
@@ -11,11 +11,11 @@
     state: directory
   when: has_cloudprovider | bool
 
-- include: openstack.yml
+- include_tasks: openstack.yml
   when: cloudprovider_is_openstack | bool
 
-- include: aws.yml
+- include_tasks: aws.yml
   when: cloudprovider_is_aws | bool
 
-- include: gce.yml
+- include_tasks: gce.yml
   when: cloudprovider_is_gce | bool
diff --git a/roles/openshift_excluder/tasks/disable.yml b/roles/openshift_excluder/tasks/disable.yml
index 5add25b45..21801b994 100644
--- a/roles/openshift_excluder/tasks/disable.yml
+++ b/roles/openshift_excluder/tasks/disable.yml
@@ -2,11 +2,11 @@
 - when: r_openshift_excluder_verify_upgrade
   block:
   - name: Include verify_upgrade.yml when upgrading
-    include: verify_upgrade.yml
+    include_tasks: verify_upgrade.yml
 
 # unexclude the current openshift/origin-excluder if it is installed so it can be updated
 - name: Disable excluders before the upgrade to remove older excluding expressions
-  include: unexclude.yml
+  include_tasks: unexclude.yml
   vars:
     # before the docker excluder can be updated, it needs to be disabled
     # to remove older excluded packages that are no longer excluded
@@ -15,12 +15,12 @@
 
 # Install any excluder that is enabled
 - name: Include install.yml
-  include: install.yml
+  include_tasks: install.yml
 
 # And finally adjust an excluder in order to update host components correctly. First
 # exclude then unexclude
 - name: Include exclude.yml
-  include: exclude.yml
+  include_tasks: exclude.yml
   vars:
     # Enable the docker excluder only if it is overridden
     # BZ #1430612: docker excluders should be enabled even during installation and upgrade
@@ -30,7 +30,7 @@
 
 # All excluders that are to be disabled are disabled
 - name: Include unexclude.yml
-  include: unexclude.yml
+  include_tasks: unexclude.yml
   vars:
     # If the docker override  is not set, default to the generic behaviour
     # BZ #1430612: docker excluders should be enabled even during installation and upgrade
diff --git a/roles/openshift_excluder/tasks/enable.yml b/roles/openshift_excluder/tasks/enable.yml
index fce44cfb5..7c3742a06 100644
--- a/roles/openshift_excluder/tasks/enable.yml
+++ b/roles/openshift_excluder/tasks/enable.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install excluders
-  include: install.yml
+  include_tasks: install.yml
 
 - name: Enable excluders
-  include: exclude.yml
+  include_tasks: exclude.yml
diff --git a/roles/openshift_excluder/tasks/main.yml b/roles/openshift_excluder/tasks/main.yml
index db20b4012..93d6ef149 100644
--- a/roles/openshift_excluder/tasks/main.yml
+++ b/roles/openshift_excluder/tasks/main.yml
@@ -32,7 +32,7 @@
     - r_openshift_excluder_upgrade_target is not defined
 
   - name: Include main action task file
-    include: "{{ r_openshift_excluder_action }}.yml"
+    include_tasks: "{{ r_openshift_excluder_action }}.yml"
 
   when:
   - not ostree_booted.stat.exists | bool
diff --git a/roles/openshift_excluder/tasks/verify_upgrade.yml b/roles/openshift_excluder/tasks/verify_upgrade.yml
index 42026664a..b55a9af23 100644
--- a/roles/openshift_excluder/tasks/verify_upgrade.yml
+++ b/roles/openshift_excluder/tasks/verify_upgrade.yml
@@ -1,12 +1,12 @@
 ---
 - name: Verify Docker Excluder version
-  include: verify_excluder.yml
+  include_tasks: verify_excluder.yml
   vars:
     excluder: "{{ r_openshift_excluder_service_type }}-docker-excluder"
   when: r_openshift_excluder_enable_docker_excluder | bool
 
 - name: Verify OpenShift Excluder version
-  include: verify_excluder.yml
+  include_tasks: verify_excluder.yml
   vars:
     excluder: "{{ r_openshift_excluder_service_type }}-excluder"
   when: r_openshift_excluder_enable_openshift_excluder | bool
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index b6d3539b1..e2f92d597 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -31,8 +31,7 @@
   - openshift.common.is_containerized | bool
 
 - name: Open up firewall ports
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
 
 - name: Install Master package
   package:
@@ -172,13 +171,13 @@
       no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}"
 
 - name: Update journald config
-  include: journald.yml
+  include_tasks: journald.yml
 
 - name: Install the systemd units
-  include: systemd_units.yml
+  include_tasks: systemd_units.yml
 
 - name: Install Master system container
-  include: system_container.yml
+  include_tasks: system_container.yml
   when:
   - openshift.common.is_containerized | bool
   - openshift.common.is_master_system_container | bool
@@ -212,10 +211,10 @@
   - restart master api
   - restart master controllers
 
-- include: bootstrap_settings.yml
+- include_tasks: bootstrap_settings.yml
   when: openshift_master_bootstrap_enabled | default(False)
 
-- include: set_loopback_context.yml
+- include_tasks: set_loopback_context.yml
 
 - name: Start and enable master api on first master
   systemd:
@@ -273,7 +272,7 @@
 
 # A separate wait is required here for native HA since notifies will
 # be resolved after all tasks in the role.
-- include: check_master_api_is_ready.yml
+- include_tasks: check_master_api_is_ready.yml
   when:
   - openshift.master.cluster_method == 'native'
   - master_api_service_status_changed | bool
@@ -323,5 +322,5 @@
   - l_install_result | changed
 
 - name: node bootstrap settings
-  include: bootstrap.yml
+  include_tasks: bootstrap.yml
   when: openshift_master_bootstrap_enabled | default(False)
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index b0fa72f19..582185198 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -9,7 +9,7 @@
   when:
   - openshift.common.is_containerized | bool
 
-- include: registry_auth.yml
+- include_tasks: registry_auth.yml
 
 - name: Disable the legacy master service if it exists
   systemd:
diff --git a/roles/openshift_master/tasks/upgrade.yml b/roles/openshift_master/tasks/upgrade.yml
index 92371921d..f84cf2f6e 100644
--- a/roles/openshift_master/tasks/upgrade.yml
+++ b/roles/openshift_master/tasks/upgrade.yml
@@ -1,16 +1,16 @@
 ---
-- include: upgrade/rpm_upgrade.yml
+- include_tasks: upgrade/rpm_upgrade.yml
   when: not openshift.common.is_containerized | bool
 
-- include: upgrade/upgrade_scheduler.yml
+- include_tasks: upgrade/upgrade_scheduler.yml
 
 # master_config_hook is passed in from upgrade play.
-- include: "upgrade/{{ master_config_hook }}"
+- include_tasks: "upgrade/{{ master_config_hook }}"
   when: master_config_hook is defined
 
-- include: journald.yml
+- include_tasks: journald.yml
 
-- include: systemd_units.yml
+- include_tasks: systemd_units.yml
 
 - name: Check for ca-bundle.crt
   stat:
diff --git a/roles/openshift_master_cluster/tasks/main.yml b/roles/openshift_master_cluster/tasks/main.yml
index 40705d357..41bfc72cb 100644
--- a/roles/openshift_master_cluster/tasks/main.yml
+++ b/roles/openshift_master_cluster/tasks/main.yml
@@ -10,5 +10,5 @@
   failed_when: false
   when: openshift.master.cluster_method == "pacemaker"
 
-- include: configure.yml
+- include_tasks: configure.yml
   when: "pcs_status | failed and 'Error: cluster is not currently running on this node' in pcs_status.stderr"
diff --git a/roles/openshift_node_group/tasks/main.yml b/roles/openshift_node_group/tasks/main.yml
index c7c15683d..43ecf1b8b 100644
--- a/roles/openshift_node_group/tasks/main.yml
+++ b/roles/openshift_node_group/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Build node config maps
-  include: create_config.yml
+  include_tasks: create_config.yml
   vars:
     openshift_node_group_name: "{{ node_group.name }}"
     openshift_node_group_edits: "{{ node_group.edits | default([]) }}"