Merge "Configurable haproxy network whitelists"

This commit is contained in:
Jenkins
2017-04-07 17:28:33 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 4 deletions

View File

@@ -31,3 +31,4 @@ haproxy_nova_metadata_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_rabbitmq_management_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_repo_git_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_repo_cache_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_octavia_whitelist_networks: "{{ haproxy_whitelist_networks }}"

View File

@@ -271,7 +271,4 @@ haproxy_default_services:
haproxy_balance_type: http
haproxy_backend_options:
- "httpchk GET /"
haproxy_whitelist_networks:
- 192.168.0.0/16
- 172.16.0.0/12
- 10.0.0.0/8
haproxy_whitelist_networks: "{{ haproxy_octavia_whitelist_networks }}"