Merge "Whitelist Octavia API" into stable/queens
This commit is contained in:
commit
0903b51541
@ -35,7 +35,6 @@ haproxy_nova_placement_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 }}"
|
||||
haproxy_opendaylight_whitelist_networks: "{{ haproxy_whitelist_networks }}"
|
||||
|
||||
haproxy_default_services:
|
||||
@ -322,7 +321,6 @@ haproxy_default_services:
|
||||
haproxy_balance_type: http
|
||||
haproxy_backend_options:
|
||||
- "httpchk GET / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
|
||||
haproxy_whitelist_networks: "{{ haproxy_octavia_whitelist_networks }}"
|
||||
haproxy_service_enabled: "{{ groups['octavia_all'] is defined and groups['octavia_all'] | length > 0 }}"
|
||||
- service:
|
||||
haproxy_service_name: tacker
|
||||
|
Loading…
Reference in New Issue
Block a user