Merge branch 'main' into feat/allow-addtl-monitors

Author: yaguangtang

.charts.yml

@@ -161,6 +161,10 @@ charts:
     version: 0.3.46
     repository: *openstack_helm_repository
     dependencies: *openstack_helm_dependencies
+    patches:
+      gerrit:
+        review.opendev.org:
+          - 954211
   - name: octavia
     version: 0.2.9
     repository: *openstack_helm_repository

.github/styles/config/vocabularies/Base/accept.txt

@@ -18,6 +18,7 @@ MySQL
 Nova
 OCI
 OVN
+OpenStack
 Percona
 QEMU
 SST

.pre-commit-config.yaml

@@ -43,6 +43,6 @@ repos:
         args: ["--profile", "black", "--filter-files"]
 
   - repo: https://github.com/ansible/ansible-lint.git
-    rev: v25.1.2
+    rev: v25.6.1
     hooks:
       - id: ansible-lint

charts/nova/values.yaml

@@ -1435,6 +1435,7 @@ conf:
       auth_type: password
       auth_version: v3
     cinder:
+      auth_type: password
       catalog_info: volumev3::internalURL
     database:
       max_retries: -1
@@ -1857,6 +1858,22 @@ endpoints:
       api:
         default: 9292
         public: 80
+  volumev3:
+    name: cinderv3
+    hosts:
+      default: cinder-api
+      public: cinder
+    host_fqdn_override:
+      default: null
+    path:
+      default: '/v3/%(tenant_id)s'
+      healthcheck: /healthcheck
+    scheme:
+      default: http
+    port:
+      api:
+        default: 8776
+        public: 80
   compute:
     name: nova
     hosts:

releasenotes/notes/fix-cinder-auth-in-nova-adead5a3a276781a.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Corrected Cinder authentication configuration handling in Nova.
+    Nova now respects authentication overrides defined in OpenStack Helm endpoints,
+    such as ``openstack_helm_endpoints_nova_region_name``.

roles/nova/vars/main.yml

@@ -61,8 +61,6 @@ _nova_helm_values:
         barbican_endpoint_type: internal
       cache:
         backend: oslo_cache.memcache_pool
-      cinder:
-        auth_type: password
       conductor:
         workers: 8
       compute: