Fix rook ceph dashboard address in kolla loadbalancer (#2462)

Signed-off-by: Christian Berendt <berendt@osism.tech>

environments/kolla/files/overlays/haproxy/services.d/haproxy.cfg

@@ -1,7 +1,5 @@
 #jinja2: lstrip_blocks: True
 
-# OSISM specific configuration
-
 {% if openstack_version == "2023.2" or openstack_version == "2024.1" %}
 {%- set internal_tls_bind_info = 'ssl crt /etc/haproxy/certificates/haproxy-internal.pem' if kolla_enable_tls_internal|bool else '' %}
 {% else %}
@@ -12,9 +10,12 @@ listen ceph_dashboard
   option httpchk
   http-check expect status 200,404
   http-check disable-on-404
+{% if ceph_dashboard_address|default(none) %}
   {{ "bind %s:%s %s"|e|format(kolla_internal_vip_address, 8140, internal_tls_bind_info)|trim() }}
+  server rook {{ ceph_dashboard_address }}:7000 check inter 2000 rise 2 fall 5
+{% else %}
 {% for host in groups['ceph-mgr'] %}
+  {{ "bind %s:%s %s"|e|format(kolla_internal_vip_address, 8140, internal_tls_bind_info)|trim() }}
   server {{ hostvars[host]['ansible_facts']['hostname'] }} {{ hostvars[host]['monitor_address'] }}:7000 check inter 2000 rise 2 fall 5
 {% endfor %}
-
-# customer specific configuration
+{% endif %}

environments/rook/configuration.yml

@@ -1,12 +1,13 @@
 ---
 rook_network_public: 192.168.128.0/20
+
 rook_storage_devicefilter: "^sd[b-c]"
 rook_storage_nodes:
   - name: testbed-node-3
   - name: testbed-node-4
   - name: testbed-node-5
 
-## reduce resources to fit into testbed
+# reduce resources to fit into testbed
 rook_resources_cephfilesystem:
   limits:
     memory: "4Gi"
@@ -20,7 +21,13 @@ rook_resources_cephobjecstore:
     cpu: "500m"
     memory: "1Gi"
 
-## set to true to enable monitoring
+rook_dashboard:
+  enabled: true
+  port: 7000
+  ssl: false
+
+# set to true to enable monitoring
 # rook_monitoring_enabled: true
-## set to true to enable cleanup
+
+# set to true to enable cleanup
 # rook_cleanup: true

scripts/deploy/100-rook-services.sh

@@ -33,3 +33,6 @@ done
 
 CEPH_RGW_ADDRESS=$(kubectl get services -n rook-ceph rook-ceph-rgw-rgw -o jsonpath='{.spec.clusterIP}')
 echo "ceph_rgw_hosts: [{host: rook, ip: $CEPH_RGW_ADDRESS, port: 8081}]" >> /opt/configuration/environments/kolla/configuration.yml
+
+CEPH_DASHBOARD_ADDRESS=$(kubectl get services -n rook-ceph rook-ceph-mgr-dashboard -o jsonpath='{.spec.clusterIP}')
+echo "ceph_dashboard_address: $CEPH_DASHBOARD_ADDRESS" >> /opt/configuration/environments/kolla/configuration.yml