summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 09:51:43 -0500
committerRussell Teague <rteague@redhat.com>2017-11-22 09:51:43 -0500
commit508ea5e5e6fff3010400ab90a15296426884f7f5 (patch)
tree69976062483e95bdc21423d1f4670634a8049809 /roles
parent4f83051b3b7c80e3ad71fc28108cd1fc3646b385 (diff)
downloadopenshift-508ea5e5e6fff3010400ab90a15296426884f7f5.tar.gz
openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.tar.bz2
openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.tar.xz
openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.zip
Include Deprecation - openshift-loadbalancer
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_loadbalancer/tasks/main.yml3
-rw-r--r--roles/os_firewall/tasks/main.yml4
2 files changed, 3 insertions, 4 deletions
diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml
index 69b061fc5..c87a327a4 100644
--- a/roles/openshift_loadbalancer/tasks/main.yml
+++ b/roles/openshift_loadbalancer/tasks/main.yml
@@ -1,7 +1,6 @@
---
- name: setup firewall
- include: firewall.yml
- static: yes
+ import_tasks: firewall.yml
- name: Install haproxy
package: name=haproxy 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