openstack/openstack-ansible
Code Issues Proposed changes

Merge "Do not fail when nova console is disabled"

Browse Source
This commit is contained in:
Zuul 2021-12-06 11:19:17 +00:00 committed by Gerrit Code Review
commit 8ceceb4a70
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/group_vars/all/nova.yml
View File

@ -29,6 +29,10 @@ nova_consoles:
serial:
port: "{{ nova_serialconsoleproxy_port | default('6083') }}"
path: "/"
disabled:
port: 0
path: ""
nova_console_type: "{{ (ansible_architecture == 'aarch64') | ternary('serialconsole', 'novnc') }}"
nova_console_port: "{{ nova_consoles[nova_console_type]['port'] }}"
nova_console_path: "{{ nova_consoles[nova_console_type]['path'] }}"

2
inventory/group_vars/haproxy/haproxy.yml
View File

@ -364,7 +364,7 @@ haproxy_nova_console_service:
haproxy_balance_alg: source
haproxy_backend_options: "{{ haproxy_nova_console_http_mode | ternary(['httpchk HEAD ' + nova_console_path + ' HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck'], []) }}"
haproxy_backend_httpcheck_options: "{{ haproxy_nova_console_http_mode | ternary(['expect status 200'], []) }}"
haproxy_service_enabled: "{{ groups['nova_console'] is defined and groups['nova_console'] | length > 0 }}"
haproxy_service_enabled: "{{ groups['nova_console'] is defined and groups['nova_console'] | length > 0 and nova_console_type != 'disabled' }}"
haproxy_octavia_service:
haproxy_service_name: octavia