diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 09:51:43 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-11-22 09:51:43 -0500 |
| commit | 508ea5e5e6fff3010400ab90a15296426884f7f5 (patch) | |
| tree | 69976062483e95bdc21423d1f4670634a8049809 | |
| parent | 4f83051b3b7c80e3ad71fc28108cd1fc3646b385 (diff) | |
| download | openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.tar.gz openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.tar.bz2 openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.tar.xz openshift-508ea5e5e6fff3010400ab90a15296426884f7f5.zip | |
Include Deprecation - openshift-loadbalancer
| -rw-r--r-- | playbooks/openshift-loadbalancer/config.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/main.yml | 4 |
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 |