Include Deprecation - openshift-node

6 files changed, 27 insertions, 30 deletions

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