summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 13:23:02 -0500
committerGitHub <noreply@github.com>2017-11-22 13:23:02 -0500
commit2481c68973623afefa785f03a23d9515d1fba1dd (patch)
treeb9421a68ca990c7cae5f63d6d7c5c4c4ac444d70
parent440daa20f28b162fe8b104c4b0c2a0ae51967a09 (diff)
parentbf7a2b87f4288da12dff656c9f52b45c60ab4410 (diff)
downloadopenshift-2481c68973623afefa785f03a23d9515d1fba1dd.tar.gz
openshift-2481c68973623afefa785f03a23d9515d1fba1dd.tar.bz2
openshift-2481c68973623afefa785f03a23d9515d1fba1dd.tar.xz
openshift-2481c68973623afefa785f03a23d9515d1fba1dd.zip
Merge pull request #6228 from mtnbikenc/include-deprecation-openshift-nfs
Include Deprecation - openshift-nfs
-rw-r--r--playbooks/openshift-nfs/config.yml4
-rw-r--r--roles/openshift_storage_nfs/tasks/main.yml3
2 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/openshift-nfs/config.yml b/playbooks/openshift-nfs/config.yml
index 8ee57ce8d..c7814207c 100644
--- a/playbooks/openshift-nfs/config.yml
+++ b/playbooks/openshift-nfs/config.yml
@@ -1,4 +1,4 @@
---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
-- include: private/config.yml
+- import_playbook: private/config.yml
diff --git a/roles/openshift_storage_nfs/tasks/main.yml b/roles/openshift_storage_nfs/tasks/main.yml
index c4e023c1e..24264fa43 100644
--- a/roles/openshift_storage_nfs/tasks/main.yml
+++ b/roles/openshift_storage_nfs/tasks/main.yml
@@ -1,7 +1,6 @@
---
- name: setup firewall
- include: firewall.yml
- static: yes
+ import_tasks: firewall.yml
- name: Install nfs-utils
package: name=nfs-utils state=present