From d32ab495ae636bb381b4e325ca4f4f913947187d Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Wed, 22 Nov 2017 14:28:20 -0500
Subject: Playbook Consolidation - openshift-provisioners

---
 roles/openshift_provisioners/tasks/install_provisioners.yaml   | 8 ++++----
 roles/openshift_provisioners/tasks/install_support.yaml        | 6 +++---
 roles/openshift_provisioners/tasks/main.yaml                   | 4 ++--
 roles/openshift_provisioners/tasks/uninstall_provisioners.yaml | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'roles/openshift_provisioners')

diff --git a/roles/openshift_provisioners/tasks/install_provisioners.yaml b/roles/openshift_provisioners/tasks/install_provisioners.yaml
index 324fdcc82..2d1217c74 100644
--- a/roles/openshift_provisioners/tasks/install_provisioners.yaml
+++ b/roles/openshift_provisioners/tasks/install_provisioners.yaml
@@ -16,10 +16,10 @@
   when: (openshift_provisioners_efs | bool) and openshift_provisioners_efs_aws_secret_access_key is not defined
 
 - name: Install support
-  include: install_support.yaml
+  include_tasks: install_support.yaml
 
 - name: Install EFS
-  include: install_efs.yaml
+  include_tasks: install_efs.yaml
   when: openshift_provisioners_efs | bool
 
 - find: paths={{ mktemp.stdout }}/templates patterns=*.yaml
@@ -32,7 +32,7 @@
   changed_when: no
 
 - name: Create objects
-  include: oc_apply.yaml
+  include_tasks: oc_apply.yaml
   vars:
     - kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
     - namespace: "{{ openshift_provisioners_project }}"
@@ -51,5 +51,5 @@
   when: ansible_check_mode
 
 - name: Scaling up cluster
-  include: start_cluster.yaml
+  include_tasks: start_cluster.yaml
   when: start_cluster | default(true) | bool
diff --git a/roles/openshift_provisioners/tasks/install_support.yaml b/roles/openshift_provisioners/tasks/install_support.yaml
index d6db81ab9..93c4c394d 100644
--- a/roles/openshift_provisioners/tasks/install_support.yaml
+++ b/roles/openshift_provisioners/tasks/install_support.yaml
@@ -10,8 +10,8 @@
   changed_when: False
   check_mode: no
 
-- include: generate_secrets.yaml
+- include_tasks: generate_secrets.yaml
 
-- include: generate_clusterrolebindings.yaml
+- include_tasks: generate_clusterrolebindings.yaml
 
-- include: generate_serviceaccounts.yaml
+- include_tasks: generate_serviceaccounts.yaml
diff --git a/roles/openshift_provisioners/tasks/main.yaml b/roles/openshift_provisioners/tasks/main.yaml
index a50c78c97..4ba26b2b8 100644
--- a/roles/openshift_provisioners/tasks/main.yaml
+++ b/roles/openshift_provisioners/tasks/main.yaml
@@ -12,10 +12,10 @@
   check_mode: no
   tags: provisioners_init
 
-- include: "{{ role_path }}/tasks/install_provisioners.yaml"
+- include_tasks: install_provisioners.yaml
   when: openshift_provisioners_install_provisioners | default(false) | bool
 
-- include: "{{ role_path }}/tasks/uninstall_provisioners.yaml"
+- include_tasks: uninstall_provisioners.yaml
   when: not openshift_provisioners_install_provisioners | default(false) | bool
 
 - name: Delete temp directory
diff --git a/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml b/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml
index 0be4bc7d2..602dee773 100644
--- a/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml
+++ b/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml
@@ -1,6 +1,6 @@
 ---
 - name: stop provisioners
-  include: stop_cluster.yaml
+  include_tasks: stop_cluster.yaml
 
 # delete the deployment objects that we had created
 - name: delete provisioner api objects
-- 
cgit v1.2.3