diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-05 16:19:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 16:19:23 -0500 |
| commit | 31d19c5e68e61d004a93db738772c120e7dd0eb5 (patch) | |
| tree | 1b5a2642ca9645ab97aa79cd1ca36537d8b64f8c /roles/openshift_management/tasks | |
| parent | caec381b6cd0ea632cfe927c23b6229ab69e834a (diff) | |
| parent | eacc12897ca86a255f89b8a4537ce2b7004cf319 (diff) | |
| download | openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.gz openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.bz2 openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.xz openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.zip | |
Merge pull request #6627 from sdodson/import_role
Migrate to import_role for static role inclusion
Diffstat (limited to 'roles/openshift_management/tasks')
| -rw-r--r-- | roles/openshift_management/tasks/add_container_provider.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_management/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_management/tasks/storage/nfs.yml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_management/tasks/add_container_provider.yml b/roles/openshift_management/tasks/add_container_provider.yml index ca381b105..357e6a710 100644 --- a/roles/openshift_management/tasks/add_container_provider.yml +++ b/roles/openshift_management/tasks/add_container_provider.yml @@ -1,6 +1,6 @@ --- - name: Ensure OpenShift facts module is available - include_role: + import_role: role: openshift_facts - name: Ensure OpenShift facts are loaded diff --git a/roles/openshift_management/tasks/main.yml b/roles/openshift_management/tasks/main.yml index f212dba7c..c4b204b98 100644 --- a/roles/openshift_management/tasks/main.yml +++ b/roles/openshift_management/tasks/main.yml @@ -8,7 +8,7 @@ # This creates a service account allowing Container Provider # integration (managing OCP/Origin via MIQ/Management) - name: Enable Container Provider Integration - include_role: + import_role: role: openshift_manageiq - name: "Ensure the Management '{{ openshift_management_project }}' namespace exists" diff --git a/roles/openshift_management/tasks/storage/nfs.yml b/roles/openshift_management/tasks/storage/nfs.yml index 94e11137c..9e3a4d43a 100644 --- a/roles/openshift_management/tasks/storage/nfs.yml +++ b/roles/openshift_management/tasks/storage/nfs.yml @@ -5,14 +5,14 @@ - name: Setting up NFS storage block: - name: Include the NFS Setup role tasks - include_role: + import_role: role: openshift_nfs tasks_from: setup vars: l_nfs_base_dir: "{{ openshift_management_storage_nfs_base_dir }}" - name: Create the App export - include_role: + import_role: role: openshift_nfs tasks_from: create_export vars: @@ -22,7 +22,7 @@ l_nfs_options: "*(rw,no_root_squash,no_wdelay)" - name: Create the DB export - include_role: + import_role: role: openshift_nfs tasks_from: create_export vars: |