summaryrefslogtreecommitdiffstats
path: root/roles/openshift_management
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-07 08:11:19 -0800
committerGitHub <noreply@github.com>2017-12-07 08:11:19 -0800
commite5faa36d01cba99c2f1e67cfd126f5b5be11d367 (patch)
tree2885de4ef2e3a783e99fdb3d95464f98ab495284 /roles/openshift_management
parent5a13532a2129b0226d24cdc88b5e73ff67d43f5e (diff)
parent50751e3c5e8e8dca97cd27d4c93944515666c8b5 (diff)
downloadopenshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.tar.gz
openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.tar.bz2
openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.tar.xz
openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.zip
Merge pull request #6372 from mtnbikenc/include-to-include_tasks
Automatic merge from submit-queue. Include Deprecation: Convert to include_tasks For all roles/ * Converts to include_tasks: for dynamic includes * Converts to import_tasks: for static includes Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
Diffstat (limited to 'roles/openshift_management')
-rw-r--r--roles/openshift_management/tasks/main.yml12
-rw-r--r--roles/openshift_management/tasks/storage/storage.yml2
2 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_management/tasks/main.yml b/roles/openshift_management/tasks/main.yml
index 3bade9e8c..f212dba7c 100644
--- a/roles/openshift_management/tasks/main.yml
+++ b/roles/openshift_management/tasks/main.yml
@@ -3,7 +3,7 @@
# Users, projects, and privileges
- name: Run pre-install Management validation checks
- include: validate.yml
+ include_tasks: validate.yml
# This creates a service account allowing Container Provider
# integration (managing OCP/Origin via MIQ/Management)
@@ -18,18 +18,18 @@
display_name: "{{ openshift_management_project_description }}"
- name: Create and Authorize Management Accounts
- include: accounts.yml
+ include_tasks: accounts.yml
######################################################################
# STORAGE - Initialize basic storage class
- name: Determine the correct NFS host if required
- include: storage/nfs_server.yml
+ include_tasks: storage/nfs_server.yml
when: openshift_management_storage_class in ['nfs', 'nfs_external']
#---------------------------------------------------------------------
# * nfs - set up NFS shares on the first master for a proof of concept
- name: Create required NFS exports for Management app storage
- include: storage/nfs.yml
+ include_tasks: storage/nfs.yml
when: openshift_management_storage_class == 'nfs'
#---------------------------------------------------------------------
@@ -56,14 +56,14 @@
######################################################################
# APPLICATION TEMPLATE
- name: Install the Management app and PV templates
- include: template.yml
+ include_tasks: template.yml
######################################################################
# APP & DB Storage
# For local/external NFS backed installations
- name: "Create the required App and DB PVs using {{ openshift_management_storage_class }}"
- include: storage/create_nfs_pvs.yml
+ include_tasks: storage/create_nfs_pvs.yml
when:
- openshift_management_storage_class in ['nfs', 'nfs_external']
diff --git a/roles/openshift_management/tasks/storage/storage.yml b/roles/openshift_management/tasks/storage/storage.yml
index d8bf7aa3e..a3675b29b 100644
--- a/roles/openshift_management/tasks/storage/storage.yml
+++ b/roles/openshift_management/tasks/storage/storage.yml
@@ -1,3 +1,3 @@
---
-- include: nfs.yml
+- include_tasks: nfs.yml
when: not (openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'))