diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-21 12:47:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-21 12:47:50 +0000 |
| commit | 3fef52fd933aa5d5fd0e61d80f4c7fb12ef7f45e (patch) | |
| tree | a50cd0f2f82f446532ed96d470da17ef9535a6f1 /ansible | |
| parent | 3a6b9f3d9fc668c51024fab67e66967909db45ee (diff) | |
| parent | 2fbb067b562c2c5b520b48313daeb8df7148cdb0 (diff) | |
| download | kolla-ansible-3fef52fd933aa5d5fd0e61d80f4c7fb12ef7f45e.tar.gz kolla-ansible-3fef52fd933aa5d5fd0e61d80f4c7fb12ef7f45e.zip | |
Merge "Apply public firewalld rules immediately"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/haproxy-config/tasks/main.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/loadbalancer/handlers/main.yml | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/ansible/roles/haproxy-config/tasks/main.yml b/ansible/roles/haproxy-config/tasks/main.yml index 94edd79f5..1e3f293ad 100644 --- a/ansible/roles/haproxy-config/tasks/main.yml +++ b/ansible/roles/haproxy-config/tasks/main.yml @@ -54,8 +54,9 @@ - name: "Configuring firewall for {{ project_name }}" firewalld: - offline: "yes" - permanent: "yes" + immediate: true + offline: true + permanent: true port: "{{ item.value.port }}/tcp" state: "enabled" zone: "{{ external_api_firewalld_zone }}" @@ -68,5 +69,3 @@ - enable_external_api_firewalld | bool - kolla_action != "config" with_dict: "{{ project_services | extract_haproxy_services }}" - notify: - - "Reload firewalld" diff --git a/ansible/roles/loadbalancer/handlers/main.yml b/ansible/roles/loadbalancer/handlers/main.yml index a94a740ca..4c8688c1b 100644 --- a/ansible/roles/loadbalancer/handlers/main.yml +++ b/ansible/roles/loadbalancer/handlers/main.yml @@ -1,10 +1,4 @@ --- -- name: Reload firewalld - become: True - service: - name: "firewalld" - state: reloaded - # NOTE(yoctozepto): this handler dance is to ensure we delay restarting master # keepalived and haproxy which control VIP address until we have working backups. # This could be improved by checking if backup keepalived do not report FAULT state. |