Include Deprecation - openshift-node

29 files changed, 87 insertions, 91 deletions

diff --git a/playbooks/openshift-node/certificates.yml b/playbooks/openshift-node/certificates.yml
index 0384877d9..7ae87c09a 100644
--- a/playbooks/openshift-node/certificates.yml
+++ b/playbooks/openshift-node/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-node/config.yml b/playbooks/openshift-node/config.yml
index 8ee57ce8d..c7814207c 100644
--- a/playbooks/openshift-node/config.yml
+++ b/playbooks/openshift-node/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-node/network_manager.yml b/playbooks/openshift-node/network_manager.yml
index c0900308c..88a93952d 100644
--- a/playbooks/openshift-node/network_manager.yml
+++ b/playbooks/openshift-node/network_manager.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/evaluate_groups.yml
+- import_playbook: ../init/evaluate_groups.yml
 
-- include: private/network_manager.yml
+- import_playbook: private/network_manager.yml
diff --git a/playbooks/openshift-node/private/additional_config.yml b/playbooks/openshift-node/private/additional_config.yml
index ac757397b..261e2048f 100644
--- a/playbooks/openshift-node/private/additional_config.yml
+++ b/playbooks/openshift-node/private/additional_config.yml
@@ -24,7 +24,7 @@
       key: oo_nodes_use_{{ (openshift_use_kuryr | default(False)) | ternary('kuryr','nothing') }}
     changed_when: False
 
-- include: etcd_client_config.yml
+- import_playbook: etcd_client_config.yml
   vars:
     openshift_node_scale_up_group: "oo_nodes_use_flannel:oo_nodes_use_calico:oo_nodes_use_contiv:oo_nodes_use_kuryr"
 
diff --git a/playbooks/openshift-node/private/config.yml b/playbooks/openshift-node/private/config.yml
index 28e3c1b1b..300a90371 100644
--- a/playbooks/openshift-node/private/config.yml
+++ b/playbooks/openshift-node/private/config.yml
@@ -11,19 +11,19 @@
           status: "In Progress"
           start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- include: certificates.yml
+- import_playbook: certificates.yml
 
-- include: setup.yml
+- import_playbook: setup.yml
 
-- include: containerized_nodes.yml
+- import_playbook: containerized_nodes.yml
 
-- include: configure_nodes.yml
+- import_playbook: configure_nodes.yml
 
-- include: additional_config.yml
+- import_playbook: additional_config.yml
 
-- include: manage_node.yml
+- import_playbook: manage_node.yml
 
-- include: enable_excluders.yml
+- import_playbook: enable_excluders.yml
 
 - name: Node Install Checkpoint End
   hosts: all
diff --git a/playbooks/openshift-node/private/image_prep.yml b/playbooks/openshift-node/private/image_prep.yml
index 3c042acdc..b7ac27bda 100644
--- a/playbooks/openshift-node/private/image_prep.yml
+++ b/playbooks/openshift-node/private/image_prep.yml
@@ -1,21 +1,21 @@
 ---
 - name: normalize groups
-  include: ../../init/evaluate_groups.yml
+  import_playbook: ../../init/evaluate_groups.yml
 
 - name: initialize the facts
-  include: ../../init/facts.yml
+  import_playbook: ../../init/facts.yml
 
 - name: initialize the repositories
-  include: ../../init/repos.yml
+  import_playbook: ../../init/repos.yml
 
 - name: run node config setup
-  include: setup.yml
+  import_playbook: setup.yml
 
 - name: run node config
-  include: configure_nodes.yml
+  import_playbook: configure_nodes.yml
 
 - name: Re-enable excluders
-  include: enable_excluders.yml
+  import_playbook: enable_excluders.yml
 
 - name: Remove any undesired artifacts from build
-  include: clean_image.yml
+  import_playbook: clean_image.yml
diff --git a/playbooks/openshift-node/private/network_manager.yml b/playbooks/openshift-node/private/network_manager.yml
index c2efb0483..fffed4dfb 100644
--- a/playbooks/openshift-node/private/network_manager.yml
+++ b/playbooks/openshift-node/private/network_manager.yml
@@ -1,5 +1,5 @@
 ---
-- include: ../../init/evaluate_groups.yml
+- import_playbook: ../../init/evaluate_groups.yml
 
 - name: Install and configure NetworkManager
   hosts: oo_all_hosts
diff --git a/playbooks/openshift-node/restart.yml b/playbooks/openshift-node/restart.yml
index 5e28e274e..041c1384d 100644
--- a/playbooks/openshift-node/restart.yml
+++ b/playbooks/openshift-node/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-node/scaleup.yml b/playbooks/openshift-node/scaleup.yml
index b4c39e37e..bdfd3d3e6 100644
--- a/playbooks/openshift-node/scaleup.yml
+++ b/playbooks/openshift-node/scaleup.yml
@@ -1,5 +1,5 @@
 ---
-- include: ../init/evaluate_groups.yml
+- import_playbook: ../init/evaluate_groups.yml
 
 - name: Ensure there are new_nodes
   hosts: localhost
@@ -16,6 +16,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/config.yml
+- import_playbook: private/config.yml
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/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml
index 9db9dbb6a..c6b7a9b10 100644
--- a/roles/nuage_node/tasks/main.yaml
+++ b/roles/nuage_node/tasks/main.yaml
@@ -31,7 +31,7 @@
     - nuage.key
     - nuage.kubeconfig
 
-- include: certificates.yml
+- include_tasks: certificates.yml
 
 - name: Add additional Docker mounts for Nuage for atomic hosts
   become: yes
@@ -44,8 +44,7 @@
     - restart node
   ignore_errors: true
 
-- include: iptables.yml
+- include_tasks: iptables.yml
 
 - name: setup firewall
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
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_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml
index b8be50f6c..ac43ef039 100644
--- a/roles/openshift_node/tasks/bootstrap.yml
+++ b/roles/openshift_node/tasks/bootstrap.yml
@@ -32,8 +32,7 @@
     regexp: "^CONFIG_FILE=.*"
 
 - name: include aws sysconfig credentials
-  include: aws.yml
-  static: yes
+  import_tasks: aws.yml
   when: not (openshift_node_use_instance_profiles | default(False))
 
 #- name: update the ExecStart to have bootstrap
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index 2fea33454..741a2234f 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install the systemd units
-  include: systemd_units.yml
+  include_tasks: systemd_units.yml
 
 - name: Start and enable openvswitch service
   systemd:
@@ -47,8 +47,7 @@
     - restart node
 
 - name: include aws provider credentials
-  include: aws.yml
-  static: yes
+  import_tasks: aws.yml
   when: not (openshift_node_use_instance_profiles | default(False))
 
 # Necessary because when you're on a node that's also a master the master will be
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index eae9ca7bc..8e9d1d1b5 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -7,8 +7,7 @@
     - not openshift_use_crio | default(false)
 
 - name: setup firewall
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
 
 #### Disable SWAP #####
 # https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
@@ -41,7 +40,7 @@
 #### End Disable Swap Block ####
 
 - name: include node installer
-  include: install.yml
+  include_tasks: install.yml
 
 - name: Restart cri-o
   systemd:
@@ -66,34 +65,34 @@
     sysctl_file: "/etc/sysctl.d/99-openshift.conf"
     reload: yes
 
-- include: registry_auth.yml
+- include_tasks: registry_auth.yml
 
 - name: include standard node config
-  include: config.yml
+  include_tasks: config.yml
 
 #### Storage class plugins here ####
 - name: NFS storage plugin configuration
-  include: storage_plugins/nfs.yml
+  include_tasks: storage_plugins/nfs.yml
   tags:
     - nfs
 
 - name: GlusterFS storage plugin configuration
-  include: storage_plugins/glusterfs.yml
+  include_tasks: storage_plugins/glusterfs.yml
   when: "'glusterfs' in openshift.node.storage_plugin_deps"
 
 - name: Ceph storage plugin configuration
-  include: storage_plugins/ceph.yml
+  include_tasks: storage_plugins/ceph.yml
   when: "'ceph' in openshift.node.storage_plugin_deps"
 
 - name: iSCSI storage plugin configuration
-  include: storage_plugins/iscsi.yml
+  include_tasks: storage_plugins/iscsi.yml
   when: "'iscsi' in openshift.node.storage_plugin_deps"
 
 ##### END Storage #####
 
-- include: config/workaround-bz1331590-ovs-oom-fix.yml
+- include_tasks: config/workaround-bz1331590-ovs-oom-fix.yml
   when: openshift_node_use_openshift_sdn | default(true) | bool
 
 - name: include bootstrap node config
-  include: bootstrap.yml
+  include_tasks: bootstrap.yml
   when: openshift_node_bootstrap
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 9b4c24dfe..6dd4838bd 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -11,18 +11,18 @@
 - when: openshift.common.is_containerized | bool
   block:
   - name: include node deps docker service file
-    include: config/install-node-deps-docker-service-file.yml
+    include_tasks: config/install-node-deps-docker-service-file.yml
 
   - name: include ovs service environment file
-    include: config/install-ovs-service-env-file.yml
+    include_tasks: config/install-ovs-service-env-file.yml
 
   - name: Install Node system container
-    include: node_system_container.yml
+    include_tasks: node_system_container.yml
     when:
     - l_is_node_system_container | bool
 
   - name: Install OpenvSwitch system containers
-    include: openvswitch_system_container.yml
+    include_tasks: openvswitch_system_container.yml
     when:
     - openshift_node_use_openshift_sdn | bool
     - openshift.common.is_openvswitch_system_container | bool
@@ -34,11 +34,11 @@
     register: pull_result
     changed_when: "'Downloaded newer image' in pull_result.stdout"
 
-  - include: config/install-ovs-docker-service-file.yml
+  - include_tasks: config/install-ovs-docker-service-file.yml
   when:
   - openshift.common.is_containerized | bool
   - openshift_node_use_openshift_sdn | bool
   - not openshift.common.is_openvswitch_system_container | bool
 
-- include: config/configure-node-settings.yml
-- include: config/configure-proxy-settings.yml
+- include_tasks: config/configure-node-settings.yml
+- include_tasks: config/configure-proxy-settings.yml
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index 2bca1e974..fb21b39a1 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -10,7 +10,7 @@
 
 # tasks file for openshift_node_upgrade
 
-- include: registry_auth.yml
+- include_tasks: registry_auth.yml
 
 - name: Stop node and openvswitch services
   service:
@@ -48,7 +48,7 @@
   - openshift.common.is_containerized | bool
   - openshift_use_openshift_sdn | bool
 
-- include: docker/upgrade.yml
+- include_tasks: docker/upgrade.yml
   vars:
     # We will restart Docker ourselves after everything is ready:
     skip_docker_restart: True
@@ -56,10 +56,10 @@
   - l_docker_upgrade is defined
   - l_docker_upgrade | bool
 
-- include: "{{ node_config_hook }}"
+- include_tasks: "{{ node_config_hook }}"
   when: node_config_hook is defined
 
-- include: upgrade/rpm_upgrade.yml
+- include_tasks: upgrade/rpm_upgrade.yml
   vars:
     component: "node"
     openshift_version: "{{ openshift_pkg_version | default('') }}"
@@ -70,7 +70,7 @@
     path: "/etc/systemd/system/docker.service.d/docker-sdn-ovs.conf"
     state: absent
 
-- include: upgrade/containerized_node_upgrade.yml
+- include_tasks: upgrade/containerized_node_upgrade.yml
   when: openshift.common.is_containerized | bool
 
 - name: Ensure containerized services stopped before Docker restart
@@ -165,7 +165,7 @@
     value: "/etc/origin/node/resolv.conf"
 
 # Restart all services
-- include: upgrade/restart.yml
+- include_tasks: upgrade/restart.yml
 
 - name: Wait for node to be ready
   oc_obj:
diff --git a/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml b/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml
index 96b94d8b6..245de60a7 100644
--- a/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml
@@ -6,7 +6,7 @@
     skip_node_svc_handlers: True
 
 - name: Update systemd units
-  include: ../systemd_units.yml
+  include_tasks: ../systemd_units.yml
 
 # This is a no-op because of skip_node_svc_handlers, but lets us trigger it before end of
 # play when the node has already been marked schedulable again. (this would look strange
diff --git a/roles/openshift_node_dnsmasq/tasks/main.yml b/roles/openshift_node_dnsmasq/tasks/main.yml
index 9bbaafc29..a33b78780 100644
--- a/roles/openshift_node_dnsmasq/tasks/main.yml
+++ b/roles/openshift_node_dnsmasq/tasks/main.yml
@@ -59,9 +59,9 @@
     state: started
 
 # Dynamic NetworkManager based dispatcher
-- include: ./network-manager.yml
+- include_tasks: ./network-manager.yml
   when: network_manager_active | bool
 
 # Relies on ansible in order to configure static config
-- include: ./no-network-manager.yml
+- include_tasks: ./no-network-manager.yml
   when: not network_manager_active | bool
diff --git a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml b/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml
index 8a7da66c2..dede2fb8f 100644
--- a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml
+++ b/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml
@@ -8,4 +8,4 @@
     state: present
   notify: restart NetworkManager
 
-- include: ./network-manager.yml
+- include_tasks: network-manager.yml