openstack
/
openstack-ansible-haproxy_server
Code Issues Proposed changes

Replace whitelist with allowlist naming 

Change-Id: I568273d0ef1d5ee391a42981e66cc9895b9d71b6
This commit is contained in:
Dmitriy Rabotyagov 2021-06-16 14:40:19 +03:00
parent 834b2927a7
commit f058cf8d61
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -57,7 +57,7 @@ haproxy_service_configs: []
# haproxy_backend_server_options:
# - "inter 3000" # a contrived example, there are many server config options possible
# haproxy_acls:
# white_list:
# allow_list:
# rule: "src 127.0.0.1/8 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8"
# backend_name: "mybackend"
# haproxy_frontend_acls:
@ -70,7 +70,7 @@ haproxy_service_configs: []
# haproxy_port: 8404
# haproxy_bind:
# - '127.0.0.1'
# haproxy_whitelist_networks: "{{ haproxy_whitelist_networks }}"
# haproxy_allowlist_networks: "{{ haproxy_allowlist_networks }}"
# haproxy_frontend_only: True
# haproxy_balance_type: "http"
# haproxy_frontend_raw:

6
releasenotes/notes/haproxy_allowlist-95aa9b911baeacd9.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
HAProxy ``haproxy_whitelist_networks`` key inside
``haproxy_service_configs`` dictionary has been replaced with
``haproxy_allowlist_networks``.

6
templates/service.j2
View File

@ -62,9 +62,9 @@ frontend {{ item.service.haproxy_service_name }}-front-{{ loop.index }}
{% if item.service.haproxy_timeout_client is defined %}
timeout client {{ item.service.haproxy_timeout_client }}
{% endif %}
{% if item.service.haproxy_whitelist_networks is defined %}
acl white_list src 127.0.0.1/8 {{ item.service.haproxy_whitelist_networks | join(' ') }}
tcp-request content accept if white_list
{% if item.service.haproxy_allowlist_networks is defined %}
acl allow_list src 127.0.0.1/8 {{ item.service.haproxy_allowlist_networks | join(' ') }}
tcp-request content accept if allow_list
tcp-request content reject
{% endif %}
{% if item.service.haproxy_acls is defined %}