set haproxy for cyborg module

fix bug: cyborg-api in controller does not work at kolla_external_fqdn with
port 6666, there is no haproxy setting for cyborg module

Closes-Bug: #2020088

Change-Id: I9d0b332420d97f4c5b02d50ce153fabd4bfd6b10
This commit is contained in:
songwenping 2023-08-07 19:45:45 +08:00 committed by Bertrand Lanson
parent 1938f555e3
commit 2adc14887d
No known key found for this signature in database
3 changed files with 24 additions and 0 deletions

View File

@ -322,7 +322,11 @@ cloudkitty_api_listen_port: "{{ cloudkitty_api_port }}"
collectd_udp_port: "25826" collectd_udp_port: "25826"
cyborg_internal_fqdn: "{{ kolla_internal_fqdn }}"
cyborg_external_fqdn: "{{ kolla_external_fqdn }}"
cyborg_api_port: "6666" cyborg_api_port: "6666"
cyborg_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else cyborg_api_port }}"
cyborg_api_listen_port: "{{ cyborg_api_port }}"
designate_internal_fqdn: "{{ kolla_internal_fqdn }}" designate_internal_fqdn: "{{ kolla_internal_fqdn }}"
designate_external_fqdn: "{{ kolla_external_fqdn }}" designate_external_fqdn: "{{ kolla_external_fqdn }}"

View File

@ -8,6 +8,20 @@ cyborg_services:
volumes: "{{ cyborg_api_default_volumes + cyborg_api_extra_volumes }}" volumes: "{{ cyborg_api_default_volumes + cyborg_api_extra_volumes }}"
dimensions: "{{ cyborg_api_dimensions }}" dimensions: "{{ cyborg_api_dimensions }}"
healthcheck: "{{ cyborg_api_healthcheck }}" healthcheck: "{{ cyborg_api_healthcheck }}"
haproxy:
cyborg_api:
enabled: "{{ enable_cyborg }}"
mode: "http"
external: false
port: "{{ cyborg_api_port }}"
listen_port: "{{ cyborg_api_listen_port }}"
cyborg_api_external:
enabled: "{{ enable_cyborg }}"
mode: "http"
external: true
external_fqdn: "{{ cyborg_external_fqdn }}"
port: "{{ cyborg_api_public_port }}"
listen_port: "{{ cyborg_api_listen_port }}"
cyborg-agent: cyborg-agent:
container_name: cyborg_agent container_name: cyborg_agent
group: cyborg-agent group: cyborg-agent

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes cyborg deployment, which was missing variables in order
to configure the haproxy listener.
`LP#2020088 <https://bugs.launchpad.net/kolla-ansible/+bug/2020088>`__