summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 11:15:09 -0500
committerGitHub <noreply@github.com>2017-11-22 11:15:09 -0500
commitdf81cfca01b7633a95359ed6097a9dd2f7b72f84 (patch)
tree9a055d43d2cde3df5e5a9a028a281b2016d0d5a9
parent012be35217f7415d50afe5e74b7e2e995feea6b5 (diff)
parent508ea5e5e6fff3010400ab90a15296426884f7f5 (diff)
downloadopenshift-df81cfca01b7633a95359ed6097a9dd2f7b72f84.tar.gz
openshift-df81cfca01b7633a95359ed6097a9dd2f7b72f84.tar.bz2
openshift-df81cfca01b7633a95359ed6097a9dd2f7b72f84.tar.xz
openshift-df81cfca01b7633a95359ed6097a9dd2f7b72f84.zip
Merge pull request #6224 from mtnbikenc/include-deprecation-openshift-loadbalancer
Include Deprecation - openshift-loadbalancer
-rw-r--r--playbooks/openshift-loadbalancer/config.yml4
-rw-r--r--roles/openshift_loadbalancer/tasks/main.yml3
-rw-r--r--roles/os_firewall/tasks/main.yml4
3 files changed, 5 insertions, 6 deletions
diff --git a/playbooks/openshift-loadbalancer/config.yml b/playbooks/openshift-loadbalancer/config.yml
index 8ee57ce8d..c7814207c 100644
--- a/playbooks/openshift-loadbalancer/config.yml
+++ b/playbooks/openshift-loadbalancer/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_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