summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 10:39:56 -0500
committerRussell Teague <rteague@redhat.com>2017-11-22 10:39:56 -0500
commitbf7a2b87f4288da12dff656c9f52b45c60ab4410 (patch)
tree20e08fb7de663458a48abc6226b40b2399ecd416
parent4f83051b3b7c80e3ad71fc28108cd1fc3646b385 (diff)
downloadopenshift-bf7a2b87f4288da12dff656c9f52b45c60ab4410.tar.gz
openshift-bf7a2b87f4288da12dff656c9f52b45c60ab4410.tar.bz2
openshift-bf7a2b87f4288da12dff656c9f52b45c60ab4410.tar.xz
openshift-bf7a2b87f4288da12dff656c9f52b45c60ab4410.zip
Include Deprecation - openshift-nfs
-rw-r--r--playbooks/openshift-nfs/config.yml4
-rw-r--r--roles/openshift_storage_nfs/tasks/main.yml3
-rw-r--r--roles/os_firewall/tasks/main.yml4
3 files changed, 5 insertions, 6 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
diff --git a/roles/os_firewall/tasks/main.yml b/roles/os_firewall/tasks/main.yml
index c477d386c..99084cd3f 100644
--- a/roles/os_firewall/tasks/main.yml
+++ b/roles/os_firewall/tasks/main.yml
@@ -8,12 +8,12 @@
set_fact:
r_os_firewall_is_atomic: "{{ r_os_firewall_ostree_booted.stat.exists }}"
-- include: firewalld.yml
+- include_tasks: firewalld.yml
when:
- os_firewall_enabled | bool
- os_firewall_use_firewalld | bool
-- include: iptables.yml
+- include_tasks: iptables.yml
when:
- os_firewall_enabled | bool
- not os_firewall_use_firewalld | bool