Merge "Load nova_console_port from a nova_console inventory item"

This commit is contained in:
Zuul 2017-10-23 15:30:42 +00:00 committed by Gerrit Code Review
commit 77c21e2e5c

View File

@ -182,7 +182,7 @@ haproxy_default_services:
haproxy_service_name: nova_console
haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
haproxy_ssl: "{{ haproxy_ssl }}"
haproxy_port: "{{ nova_console_port }}"
haproxy_port: "{{ hostvars[groups['nova_console'][0]]['nova_console_port'] }}"
haproxy_balance_type: http
haproxy_timeout_client: 60m
haproxy_timeout_server: 60m
@ -326,4 +326,4 @@ haproxy_default_services:
haproxy_timeout_client: 5000s
haproxy_timeout_server: 5000s
haproxy_whitelist_networks: "{{ haproxy_opendaylight_whitelist_networks }}"
haproxy_service_enabled: "{{ neutron_plugin_type == 'ml2.opendaylight' }}"
haproxy_service_enabled: "{{ neutron_plugin_type == 'ml2.opendaylight' }}"