Merge "Only whitelist internal network for placement api"

This commit is contained in:
Zuul 2017-12-16 10:17:23 +00:00 committed by Gerrit Code Review
commit 8f68f4b17f

View File

@ -31,6 +31,7 @@ haproxy_galera_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_glance_registry_whitelist_networks: "{{ haproxy_whitelist_networks }}" haproxy_glance_registry_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_keystone_admin_whitelist_networks: "{{ haproxy_whitelist_networks }}" haproxy_keystone_admin_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_nova_metadata_whitelist_networks: "{{ haproxy_whitelist_networks }}" haproxy_nova_metadata_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_nova_placement_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_rabbitmq_management_whitelist_networks: "{{ haproxy_whitelist_networks }}" haproxy_rabbitmq_management_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_repo_git_whitelist_networks: "{{ haproxy_whitelist_networks }}" haproxy_repo_git_whitelist_networks: "{{ haproxy_whitelist_networks }}"
haproxy_repo_cache_whitelist_networks: "{{ haproxy_whitelist_networks }}" haproxy_repo_cache_whitelist_networks: "{{ haproxy_whitelist_networks }}"
@ -179,6 +180,7 @@ haproxy_default_services:
- "httpchk HEAD /" - "httpchk HEAD /"
haproxy_backend_httpcheck_options: haproxy_backend_httpcheck_options:
- "expect status 401" - "expect status 401"
haproxy_whitelist_networks: "{{ haproxy_nova_placement_whitelist_networks }}"
- service: - service:
haproxy_service_name: nova_console haproxy_service_name: nova_console
haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}" haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"