Merge "set haproxy for cyborg module"

ansible/group_vars/all.yml

@@ -372,7 +372,11 @@ cloudkitty_api_listen_port: "{{ cloudkitty_api_port }}"
 
 collectd_udp_port: "25826"
 
+cyborg_internal_fqdn: "{{ kolla_internal_fqdn }}"
+cyborg_external_fqdn: "{{ kolla_external_fqdn }}"
 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_external_fqdn: "{{ kolla_external_fqdn }}"

ansible/roles/cyborg/defaults/main.yml

@@ -8,6 +8,20 @@ cyborg_services:
     volumes: "{{ cyborg_api_default_volumes + cyborg_api_extra_volumes }}"
     dimensions: "{{ cyborg_api_dimensions }}"
     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:
     container_name: cyborg_agent
     group: cyborg-agent

releasenotes/notes/fix-cyborg-haproxy-missing-variables-2f00c677a7003005.yaml

@@ -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>`__