diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2018-03-24 03:05:47 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2018-03-24 03:05:47 +0100 |
| commit | 5a15f65db3dfb245919bdd534e93bd711db2eb60 (patch) | |
| tree | 431e6cc7476a0c2e135983a937a9d2e6f184fe5e /roles/ands_network/tasks | |
| parent | c163108c0c0c7b7a4f05da411e98ac0f503e31e0 (diff) | |
| download | ands-5a15f65db3dfb245919bdd534e93bd711db2eb60.tar.gz ands-5a15f65db3dfb245919bdd534e93bd711db2eb60.tar.bz2 ands-5a15f65db3dfb245919bdd534e93bd711db2eb60.tar.xz ands-5a15f65db3dfb245919bdd534e93bd711db2eb60.zip | |
Minor tunning
Diffstat (limited to 'roles/ands_network/tasks')
| -rw-r--r-- | roles/ands_network/tasks/firewall.yml | 12 | ||||
| -rw-r--r-- | roles/ands_network/tasks/firewall_service.yml | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/roles/ands_network/tasks/firewall.yml b/roles/ands_network/tasks/firewall.yml index d5ba5f3..280a172 100644 --- a/roles/ands_network/tasks/firewall.yml +++ b/roles/ands_network/tasks/firewall.yml @@ -12,15 +12,21 @@ - name: Configure missing firewalld services include_tasks: firewall_service.yml - with_items: "{{ firewall_services }}" + with_items: "{{ lookup('pipe', filesearch).split('\n') }}" vars: + filesearch: "find {{ role_path }}/files/firewalld -name *.xml -mindepth 1 -maxdepth 1" + service: "{{ item | basename | regex_replace('\\.xml','') }}" servicelist: "{{ services.stdout_lines }}" - loop_control: - loop_var: service - name: Reload firewalld rules shell: firewall-cmd --reload +- name: Enable requested services + firewalld: service="{{ item }}" state="enabled" permanent="true" immediate="true" + when: ands_hostnet_db | default(false) + with_items: "{{ firewall_enabled_services }}" + + - name: Enable MySQL and Galera services if ands_hostnet_db is enabled firewalld: service="{{ item }}" state="enabled" permanent="true" immediate="true" when: ands_hostnet_db | default(false) diff --git a/roles/ands_network/tasks/firewall_service.yml b/roles/ands_network/tasks/firewall_service.yml index 98bc866..d3c6e9b 100644 --- a/roles/ands_network/tasks/firewall_service.yml +++ b/roles/ands_network/tasks/firewall_service.yml @@ -1,5 +1,5 @@ - name: "Copy firewalld service '{{ service }}'" - copy: src="{{ service }}.xml" dest="{{ firewall_template_path }}/{{ service }}.xml" owner=root group=root mode="0644" + copy: src="firewalld/{{ service }}.xml" dest="{{ firewall_template_path }}/{{ service }}.xml" owner=root group=root mode="0644" register: result - name: "Delete old version of firewalld service '{{ service }}'" |