Merge pull request #6371 from mtnbikenc/include-to-import_playbook

Automatic merge from submit-queue.

Include Deprecation: Convert to import_playbook

* Converts playbooks/ to use `import_playbook`.
* Updates remaining `include:` tasks to `include_tasks:`

Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation

18 files changed, 199 insertions, 199 deletions

diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
index 0b28ed730..5c6def484 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
@@ -1,11 +1,11 @@
 ---
-- include: ../../../../init/evaluate_groups.yml
+- import_playbook: ../../../../init/evaluate_groups.yml
   vars:
     # Do not allow adding hosts during upgrade.
     g_new_master_hosts: []
     g_new_node_hosts: []
 
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
 
 - name: Check for appropriate Docker versions
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
@@ -19,7 +19,7 @@
       msg: Cannot upgrade Docker on Atomic operating systems.
     when: openshift.common.is_atomic | bool
 
-  - include: upgrade_check.yml
+  - include_tasks: upgrade_check.yml
     when: docker_upgrade is not defined or docker_upgrade | bool
 
 
@@ -59,7 +59,7 @@
     retries: 60
     delay: 60
 
-  - include: tasks/upgrade.yml
+  - include_tasks: tasks/upgrade.yml
     when: l_docker_upgrade is defined and l_docker_upgrade | bool
 
   - name: Set node schedulability
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml
index 83be290e6..96d23f253 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml
@@ -44,5 +44,5 @@
   register: result
   until: result | success
 
-- include: restart.yml
+- include_tasks: restart.yml
   when: not skip_docker_restart | default(False) | bool
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index 9981d905b..5454a6680 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -1,11 +1,11 @@
 ---
-- include: ../../../init/evaluate_groups.yml
+- import_playbook: ../../../init/evaluate_groups.yml
   vars:
     # Do not allow adding hosts during upgrade.
     g_new_master_hosts: []
     g_new_node_hosts: []
 
-- include: ../../../init/facts.yml
+- import_playbook: ../../../init/facts.yml
 
 - name: Ensure firewall is not switched during upgrade
   hosts: oo_all_hosts
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml
index 6d8503879..18a08eb99 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml
@@ -1,7 +1,7 @@
 ---
 # Only check if docker upgrade is required if docker_upgrade is not
 # already set to False.
-- include: ../../docker/upgrade_check.yml
+- include_tasks: ../../docker/upgrade_check.yml
   when:
   - docker_upgrade is not defined or (docker_upgrade | bool)
   - not (openshift.common.is_atomic | bool)
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 4aa63d757..37fc8a0f6 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -17,7 +17,7 @@
         embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
 
 - name: Backup and upgrade etcd
-  include: ../../../openshift-etcd/private/upgrade_main.yml
+  import_playbook: ../../../openshift-etcd/private/upgrade_main.yml
 
 # Create service signer cert when missing. Service signer certificate
 # is added to master config in the master_config_upgrade hook.
@@ -30,7 +30,7 @@
     register: service_signer_cert_stat
     changed_when: false
 
-- include: create_service_signer_cert.yml
+- import_playbook: create_service_signer_cert.yml
 
 # oc adm migrate storage should be run prior to etcd v3 upgrade
 # See: https://github.com/openshift/origin/pull/14625#issuecomment-308467060
@@ -71,7 +71,7 @@
   - debug: msg="Running master pre-upgrade hook {{ openshift_master_upgrade_pre_hook }}"
     when: openshift_master_upgrade_pre_hook is defined
 
-  - include: "{{ openshift_master_upgrade_pre_hook }}"
+  - include_tasks: "{{ openshift_master_upgrade_pre_hook }}"
     when: openshift_master_upgrade_pre_hook is defined
 
   - include_role:
@@ -82,20 +82,20 @@
   - debug: msg="Running master upgrade hook {{ openshift_master_upgrade_hook }}"
     when: openshift_master_upgrade_hook is defined
 
-  - include: "{{ openshift_master_upgrade_hook }}"
+  - include_tasks: "{{ openshift_master_upgrade_hook }}"
     when: openshift_master_upgrade_hook is defined
 
-  - include: ../../../openshift-master/private/tasks/restart_hosts.yml
+  - include_tasks: ../../../openshift-master/private/tasks/restart_hosts.yml
     when: openshift.common.rolling_restart_mode == 'system'
 
-  - include: ../../../openshift-master/private/tasks/restart_services.yml
+  - include_tasks: ../../../openshift-master/private/tasks/restart_services.yml
     when: openshift.common.rolling_restart_mode == 'services'
 
   # Run the post-upgrade hook if defined:
   - debug: msg="Running master post-upgrade hook {{ openshift_master_upgrade_post_hook }}"
     when: openshift_master_upgrade_post_hook is defined
 
-  - include: "{{ openshift_master_upgrade_post_hook }}"
+  - include_tasks: "{{ openshift_master_upgrade_post_hook }}"
     when: openshift_master_upgrade_post_hook is defined
 
   - name: Post master upgrade - Upgrade clusterpolicies storage
@@ -275,7 +275,7 @@
   roles:
   - openshift_facts
   tasks:
-  - include: docker/tasks/upgrade.yml
+  - include_tasks: docker/tasks/upgrade.yml
     when: l_docker_upgrade is defined and l_docker_upgrade | bool and not openshift.common.is_atomic | bool
 
 - name: Drain and upgrade master nodes
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_scale_group.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_scale_group.yml
index 732df0545..47410dff3 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_scale_group.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_scale_group.yml
@@ -13,7 +13,7 @@
     - "'oo_sg_new_nodes' not in groups or groups.oo_sg_new_nodes|length == 0"
 
 - name: initialize upgrade bits
-  include: init.yml
+  import_playbook: init.yml
 
 - name: Drain and upgrade nodes
   hosts: oo_sg_current_nodes
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
index 5f9c56867..9f9399ff9 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
@@ -2,7 +2,7 @@
 #
 # Full Control Plane + Nodes Upgrade
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -17,7 +17,7 @@
 
 # Pre-upgrade
 
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
@@ -43,27 +43,27 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -73,29 +73,29 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -107,12 +107,12 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_6/master_config_upgrade.yml"
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml
index 1aac3d014..7374160d6 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml
@@ -11,7 +11,7 @@
 #
 # You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -25,7 +25,7 @@
       openshift_upgrade_min: "{{ '1.5' if deployment_type == 'origin' else '3.5' }}"
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
@@ -51,23 +51,23 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -77,29 +77,29 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -111,10 +111,10 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_6/master_config_upgrade.yml"
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml
index 306b76422..de9bf098e 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml
@@ -4,7 +4,7 @@
 #
 # Upgrades nodes only, but requires the control plane to have already been upgraded.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -18,7 +18,7 @@
       openshift_upgrade_min: "{{ '1.5' if deployment_type == 'origin' else '3.5' }}"
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
@@ -44,19 +44,19 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -74,25 +74,25 @@
   - fail: msg="Master running {{ openshift.common.version }} must be upgraded to {{ openshift_version }} before node upgrade can be run."
     when: openshift.common.version != openshift_version
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -104,6 +104,6 @@
 - name: Cleanup unused Docker images
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
index 6d4949542..ef362d376 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
@@ -2,7 +2,7 @@
 #
 # Full Control Plane + Nodes Upgrade
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -17,11 +17,11 @@
 
 # Pre-upgrade
 
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_etcd3_backend.yml
+- import_playbook: ../pre/verify_etcd3_backend.yml
   tags:
   - pre_upgrade
 
@@ -47,27 +47,27 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -77,29 +77,29 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -111,9 +111,9 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_7/master_config_upgrade.yml"
 
@@ -131,6 +131,6 @@
       name: "{{ openshift.common.service_type }}-master-controllers"
       state: started
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml
index 0a592896b..ea63ebb5a 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml
@@ -11,7 +11,7 @@
 #
 # You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -25,11 +25,11 @@
       openshift_upgrade_min: '3.6'
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_etcd3_backend.yml
+- import_playbook: ../pre/verify_etcd3_backend.yml
   tags:
   - pre_upgrade
 
@@ -55,23 +55,23 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -81,29 +81,29 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -115,9 +115,9 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_7/master_config_upgrade.yml"
 
@@ -135,4 +135,4 @@
       name: "{{ openshift.common.service_type }}-master-controllers"
       state: started
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_nodes.yml
index b381d606a..27a7f67ea 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_nodes.yml
@@ -4,7 +4,7 @@
 #
 # Upgrades nodes only, but requires the control plane to have already been upgraded.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -18,7 +18,7 @@
       openshift_upgrade_min: '3.6'
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
@@ -44,19 +44,19 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -74,25 +74,25 @@
   - fail: msg="Master running {{ openshift.common.version }} must be upgraded to {{ openshift_version }} before node upgrade can be run."
     when: openshift.common.version != openshift_version
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -104,6 +104,6 @@
 - name: Cleanup unused Docker images
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml
index e7d7756d1..97fe5e802 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml
@@ -2,7 +2,7 @@
 #
 # Full Control Plane + Nodes Upgrade
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -17,11 +17,11 @@
 
 # Pre-upgrade
 
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_etcd3_backend.yml
+- import_playbook: ../pre/verify_etcd3_backend.yml
   tags:
   - pre_upgrade
 
@@ -47,27 +47,27 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -77,29 +77,29 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -111,9 +111,9 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_7/master_config_upgrade.yml"
 
@@ -131,6 +131,6 @@
       name: "{{ openshift.common.service_type }}-master-controllers"
       state: started
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml
index be362e3ff..e75e4e2b0 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml
@@ -11,7 +11,7 @@
 #
 # You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -25,11 +25,11 @@
       openshift_upgrade_min: '3.7'
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_etcd3_backend.yml
+- import_playbook: ../pre/verify_etcd3_backend.yml
   tags:
   - pre_upgrade
 
@@ -55,23 +55,23 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -81,29 +81,29 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -115,9 +115,9 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_7/master_config_upgrade.yml"
 
@@ -135,4 +135,4 @@
       name: "{{ openshift.common.service_type }}-master-controllers"
       state: started
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_nodes.yml
index 6e68116b0..dd716b241 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_nodes.yml
@@ -4,7 +4,7 @@
 #
 # Upgrades nodes only, but requires the control plane to have already been upgraded.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -18,7 +18,7 @@
       openshift_upgrade_min: '3.7'
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
@@ -44,19 +44,19 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -74,25 +74,25 @@
   - fail: msg="Master running {{ openshift.common.version }} must be upgraded to {{ openshift_version }} before node upgrade can be run."
     when: openshift.common.version != openshift_version
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -104,6 +104,6 @@
 - name: Cleanup unused Docker images
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml
index 94c16cae0..eb688f189 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml
@@ -2,7 +2,7 @@
 #
 # Full Control Plane + Nodes Upgrade
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -17,11 +17,11 @@
 
 # Pre-upgrade
 
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_etcd3_backend.yml
+- import_playbook: ../pre/verify_etcd3_backend.yml
   tags:
   - pre_upgrade
 
@@ -47,27 +47,27 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -83,29 +83,29 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - import_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -117,9 +117,9 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_7/master_config_upgrade.yml"
 
@@ -137,6 +137,6 @@
       name: "{{ openshift.common.service_type }}-master-controllers"
       state: started
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
index 2045f6379..983bb4a63 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
@@ -11,7 +11,7 @@
 #
 # You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -25,11 +25,11 @@
       openshift_upgrade_min: '3.7'
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_etcd3_backend.yml
+- import_playbook: ../pre/verify_etcd3_backend.yml
   tags:
   - pre_upgrade
 
@@ -55,23 +55,23 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_master_excluders.yml
+- import_playbook: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -87,29 +87,29 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../../openshift-master/private/validate_restart.yml
+- import_playbook: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_masters_to_config
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: validator.yml
+- import_playbook: validator.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -121,9 +121,9 @@
 - name: Cleanup unused Docker images
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_control_plane.yml
+- import_playbook: ../upgrade_control_plane.yml
   vars:
     master_config_hook: "v3_7/master_config_upgrade.yml"
 
@@ -141,4 +141,4 @@
       name: "{{ openshift.common.service_type }}-master-controllers"
       state: started
 
-- include: ../post_control_plane.yml
+- import_playbook: ../post_control_plane.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_nodes.yml
index 6134f8653..d95cfa4e1 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_nodes.yml
@@ -4,7 +4,7 @@
 #
 # Upgrades nodes only, but requires the control plane to have already been upgraded.
 #
-- include: ../init.yml
+- import_playbook: ../init.yml
   tags:
   - pre_upgrade
 
@@ -18,7 +18,7 @@
       openshift_upgrade_min: '3.7'
 
 # Pre-upgrade
-- include: ../initialize_nodes_to_upgrade.yml
+- import_playbook: ../initialize_nodes_to_upgrade.yml
   tags:
   - pre_upgrade
 
@@ -44,19 +44,19 @@
     - openshift_http_proxy is defined or openshift_https_proxy is defined
     - openshift_generate_no_proxy_hosts | default(True) | bool
 
-- include: ../pre/verify_inventory_vars.yml
+- import_playbook: ../pre/verify_inventory_vars.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/verify_health_checks.yml
+- import_playbook: ../pre/verify_health_checks.yml
   tags:
   - pre_upgrade
 
-- include: ../disable_node_excluders.yml
+- import_playbook: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
 
-- include: ../../../../init/version.yml
+- import_playbook: ../../../../init/version.yml
   tags:
   - pre_upgrade
   vars:
@@ -80,25 +80,25 @@
   - fail: msg="Master running {{ openshift.common.version }} must be upgraded to {{ openshift_version }} before node upgrade can be run."
     when: openshift.common.version != openshift_version
 
-- include: ../pre/verify_control_plane_running.yml
+- import_playbook: ../pre/verify_control_plane_running.yml
   tags:
   - pre_upgrade
 
 - name: Verify upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_upgrade_targets.yml
+  - include_tasks: ../pre/verify_upgrade_targets.yml
   tags:
   - pre_upgrade
 
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
+  - include_tasks: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 
-- include: ../pre/gate_checks.yml
+- import_playbook: ../pre/gate_checks.yml
   tags:
   - pre_upgrade
 
@@ -110,6 +110,6 @@
 - name: Cleanup unused Docker images
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../cleanup_unused_images.yml
+  - include_tasks: ../cleanup_unused_images.yml
 
-- include: ../upgrade_nodes.yml
+- import_playbook: ../upgrade_nodes.yml