openstack/openstack-ansible
Code Issues Proposed changes

HAProxy: configure either novnc or spice

Browse Source 
Instead of having one useless backend, this conditionally deploys what's
needed. This consumes the override set by the deployer.

Closes-Bug: 1539246

Change-Id: I532a9bbb443a564534d7f083674fa3d39398a8bc
Signed-off-by: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
This commit is contained in:
Jean-Philippe Evrard 2016-07-01 18:18:09 +01:00
parent 2e7c5adac7
commit b511791836
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/inventory/group_vars/all.yml
View File

@ -177,6 +177,11 @@ nova_service_user_domain_id: default
nova_rabbitmq_userid: nova
nova_rabbitmq_vhost: /nova
nova_keystone_auth_plugin: password
nova_console_type: spice
nova_novncproxy_port: 6080
nova_spice_html5proxy_base_port: 6082
nova_console_port: "{% if nova_console_type == 'spice' %}{{ nova_spice_html5proxy_base_port }}{% else %}{{ nova_novncproxy_port }}{% endif %}"
## Swift
swift_system_user_name: swift

13
playbooks/vars/configs/haproxy_config.yml
View File

@ -130,18 +130,7 @@ haproxy_service_configs:
haproxy_service_name: nova_console
haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
haproxy_ssl: "{{ haproxy_ssl }}"
haproxy_port: 6082
haproxy_balance_type: tcp
haproxy_timeout_client: 60m
haproxy_timeout_server: 60m
haproxy_balance_alg: source
haproxy_backend_options:
- tcp-check
- service:
haproxy_service_name: nova_console_novnc
haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
haproxy_ssl: "{{ haproxy_ssl }}"
haproxy_port: 6080
haproxy_port: "{{ nova_console_port }}"
haproxy_balance_type: tcp
haproxy_timeout_client: 60m
haproxy_timeout_server: 60m