From e1aaa1b550e0549eea9f4c18adac29cd1b0d3138 Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko1203@gmail.com>
Date: Thu, 2 Feb 2023 05:04:13 +1100
Subject: [PATCH] Configure keystone auth credentials for placement in neutron

Change-Id: Iba03fc7142860c40c790bdf12bc24818e6921f65
---
 neutron/Chart.yaml                   |  2 +-
 neutron/templates/configmap-etc.yaml | 23 +++++++++++++++++++++++
 neutron/values.yaml                  | 11 +++++++++++
 releasenotes/notes/neutron.yaml      |  1 +
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 6e042c9c85..adc7ed9497 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.9
+version: 0.3.10
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 50de6f01df..c8c37ed8ed 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -93,6 +93,29 @@ limitations under the License.
 {{- $_ := set $envAll.Values.conf.neutron.nova "password" $envAll.Values.endpoints.identity.auth.nova.password -}}
 {{- end -}}
 
+{{- if empty $envAll.Values.conf.neutron.placement.auth_url -}}
+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.placement "auth_url" -}}
+{{- end }}
+
+{{- if empty $envAll.Values.conf.neutron.placement.region_name -}}
+{{- $_ := set $envAll.Values.conf.neutron.placement "region_name" $envAll.Values.endpoints.identity.auth.placement.region_name -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.neutron.placement.project_name -}}
+{{- $_ := set $envAll.Values.conf.neutron.placement "project_name" $envAll.Values.endpoints.identity.auth.placement.project_name -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.neutron.placement.project_domain_name -}}
+{{- $_ := set $envAll.Values.conf.neutron.placement "project_domain_name" $envAll.Values.endpoints.identity.auth.placement.project_domain_name -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.neutron.placement.user_domain_name -}}
+{{- $_ := set $envAll.Values.conf.neutron.placement "user_domain_name" $envAll.Values.endpoints.identity.auth.placement.user_domain_name -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.neutron.placement.username -}}
+{{- $_ := set $envAll.Values.conf.neutron.placement "username" $envAll.Values.endpoints.identity.auth.placement.username -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.neutron.placement.password -}}
+{{- $_ := set $envAll.Values.conf.neutron.placement "password" $envAll.Values.endpoints.identity.auth.placement.password -}}
+{{- end -}}
+
 {{- if empty $envAll.Values.conf.neutron.octavia.base_url -}}
 {{- $_ := tuple "load_balancer" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.octavia "base_url" -}}
 {{- end }}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index de63f44966..9d88bb4aed 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1797,6 +1797,10 @@ conf:
       auth_type: password
       auth_version: v3
       endpoint_type: internal
+    placement:
+      auth_type: password
+      auth_version: v3
+      endpoint_type: internal
     designate:
       auth_type: password
       auth_version: v3
@@ -2260,6 +2264,13 @@ endpoints:
         password: password
         user_domain_name: service
         project_domain_name: service
+      placement:
+        region_name: RegionOne
+        project_name: service
+        username: placement
+        password: password
+        user_domain_name: service
+        project_domain_name: service
       designate:
         region_name: RegionOne
         project_name: service
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index ccbe5662a5..bc500affcb 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -51,4 +51,5 @@ neutron:
   - 0.3.7 Sync neutron db to ovn nb db when neutron-server start
   - 0.3.8 Define service_type in keystone_authtoken to support application credentials with access rules
   - 0.3.9 Extend neutron liveness probe with readiness probe
+  - 0.3.10 Configure keystone authentication credentials for placement
 ...