From c378c56c138945b78d69b8c42218bef74b85de2b Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Wed, 22 Nov 2017 13:05:18 -0500
Subject: Include Deprecation - openshift-master

---
 roles/openshift_master/tasks/main.yml          | 17 ++++++++---------
 roles/openshift_master/tasks/systemd_units.yml |  2 +-
 roles/openshift_master/tasks/upgrade.yml       | 10 +++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'roles/openshift_master')

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:
-- 
cgit v1.2.1