fix for blazar deployment (#1192)

Author: niti6869

base-helm-configs/blazar/blazar-helm-overrides.yaml

@@ -1,13 +1,5 @@
 ---
 endpoints:
-  identity:
-    auth:
-      admin:
-        region_name: RegionOne
-      blazar:
-        region_name: RegionOne
-      test:
-        region_name: RegionOne
   reservation:
     hosts:
       public: blazar-api

bin/install-blazar.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#GLOBAL_OVERRIDES_DIR="/etc/genestack/helm-configs/global_overrides"
+GLOBAL_OVERRIDES_DIR="/etc/genestack/helm-configs/global_overrides"
 SERVICE_CONFIG_DIR="/etc/genestack/helm-configs/blazar"
 BASE_OVERRIDES="/opt/genestack/base-helm-configs/blazar/blazar-helm-overrides.yaml"
 
@@ -26,8 +26,7 @@ HELM_CMD="helm upgrade --install blazar openstack-helm/blazar --version ${BLAZAR
 HELM_CMD+=" -f ${BASE_OVERRIDES}"
 
 # Append YAML files from the directories
-#for dir in "$GLOBAL_OVERRIDES_DIR" "$SERVICE_CONFIG_DIR"; do
-for dir in "$SERVICE_CONFIG_DIR"; do
+for dir in "$GLOBAL_OVERRIDES_DIR" "$SERVICE_CONFIG_DIR"; do
     if compgen -G "${dir}/*.yaml" > /dev/null; then
         for yaml_file in "${dir}"/*.yaml; do
             HELM_CMD+=" -f ${yaml_file}"
@@ -37,7 +36,6 @@ done
 
 HELM_CMD+=" --set endpoints.identity.auth.admin.password=\"$(kubectl --namespace openstack get secret keystone-admin -o jsonpath='{.data.password}' | base64 -d)\""
 HELM_CMD+=" --set endpoints.identity.auth.blazar.password=\"$(kubectl --namespace openstack get secret blazar-admin -o jsonpath='{.data.password}' | base64 -d)\""
-HELM_CMD+=" --set endpoints.identity.auth.service.password=\"$(kubectl --namespace openstack get secret blazar-keystone-service-password -o jsonpath='{.data.password}' | base64 -d)\""
 HELM_CMD+=" --set endpoints.identity.auth.test.password=\"$(kubectl --namespace openstack get secret blazar-keystone-test-password -o jsonpath='{.data.password}' | base64 -d)\""
 HELM_CMD+=" --set endpoints.oslo_db.auth.admin.password=\"$(kubectl --namespace openstack get secret mariadb -o jsonpath='{.data.root-password}' | base64 -d)\""
 HELM_CMD+=" --set endpoints.oslo_db.auth.blazar.password=\"$(kubectl --namespace openstack get secret blazar-db-password -o jsonpath='{.data.password}' | base64 -d)\""

helm-chart-versions.yaml

@@ -1,6 +1,6 @@
 charts:
   barbican: 2024.2.208+13651f45-628a320c
-  blazar: 2025.1.1+4172872b0
+  blazar: 2025.1.2+a4df9c709
   ceilometer: 2024.2.115+13651f45-628a320c
   cinder: 2024.2.409+13651f45-628a320c
   envoy: v1.4.2

scripts/hyperconverged-lab.sh

@@ -550,18 +550,6 @@ conf:
   blazar:
     oslo_messaging_notifications:
       driver: noop
-
-endpoints:
-  reservation:
-    host_fqdn_override:
-      public:
-        tls: {}
-        host: blazar.${GATEWAY_DOMAIN}
-    port:
-      api:
-        public: 443
-    scheme:
-      public: https
 EOF
 fi
 
@@ -876,12 +864,24 @@ endpoints:
         public: 443
     scheme:
       public: https
+  reservation:
+    host_fqdn_override:
+      public:
+        tls: {}
+        host: blazar.${GATEWAY_DOMAIN}
+    port:
+      api:
+        public: 443
+    scheme:
+      public: https
   identity:
     auth:
       admin:
         region_name: *region
       barbican:
         region_name: *region
+      blazar:
+        region_name: *region
       cinder:
         region_name: *region
       ceilometer: