From e64462aa1dfedbdc9b0bc3fae22e3fcca8f5b83b Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Wed, 6 Dec 2017 09:27:18 -0500
Subject: Include Deprecation: Convert to import_playbook

---
 .../openshift-cluster/upgrades/v3_7/upgrade.yml    | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.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
-- 
cgit v1.2.1