Browse Source

Include admin tenant user

Change-Id: I762b6c4260095a61a55f5ad6e70ec58e0f922704
hs571j 2 months ago
parent
commit
77f41c71a3

+ 20
- 0
ranger-agent/templates/job-ks-user-ranger-admin.yaml View File

@@ -0,0 +1,20 @@
1
+{{/*
2
+Copyright 2017 The Openstack-Helm Authors.
3
+
4
+Licensed under the Apache License, Version 2.0 (the "License");
5
+you may not use this file except in compliance with the License.
6
+You may obtain a copy of the License at
7
+
8
+   http://www.apache.org/licenses/LICENSE-2.0
9
+
10
+Unless required by applicable law or agreed to in writing, software
11
+distributed under the License is distributed on an "AS IS" BASIS,
12
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+See the License for the specific language governing permissions and
14
+limitations under the License.
15
+*/}}
16
+
17
+{{- if .Values.manifests.job_ks_user_ranger }}
18
+{{- $ksUserJob := dict "envAll" . "serviceName" "ranger-agent" "serviceUser" "ranger_admin" -}}
19
+{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
20
+{{- end }}

+ 1
- 1
ranger-agent/templates/secret-keystone.yaml View File

@@ -16,7 +16,7 @@ limitations under the License.
16 16
 
17 17
 {{- if .Values.manifests.secret_keystone }}
18 18
 {{- $envAll := . }}
19
-{{- range $key1, $userClass := tuple "admin" "ranger" "ranger_agent" }}
19
+{{- range $key1, $userClass := tuple "admin" "ranger" "ranger_admin" "ranger_agent" }}
20 20
 {{- $secretName := index $envAll.Values.secrets.identity $userClass }}
21 21
 ---
22 22
 apiVersion: v1

+ 10
- 1
ranger-agent/values.yaml View File

@@ -261,7 +261,8 @@ pod:
261 261
 secrets:
262 262
   identity:
263 263
     admin: admin
264
-    ranger: ranger-admin
264
+    ranger: ranger-service-admin
265
+    ranger_admin: ranger-admin
265 266
     ranger_agent: ranger-agent-admin
266 267
   oslo_db:
267 268
     admin: ranger-agent-db-admin
@@ -323,6 +324,14 @@ endpoints:
323 324
         project_name: service
324 325
         user_domain_name: default
325 326
         project_domain_name: default
327
+      ranger_admin:
328
+        role: admin
329
+        region_name: RegionOne
330
+        username: ranger-admin
331
+        password: password
332
+        project_name: admin
333
+        user_domain_name: default
334
+        project_domain_name: default
326 335
     hosts:
327 336
       default: keystone
328 337
       internal: keystone-api

+ 8
- 0
ranger/values.yaml View File

@@ -246,6 +246,14 @@ endpoints:
246 246
         project_name: service
247 247
         user_domain_name: default
248 248
         project_domain_name: default
249
+      ranger_admin:
250
+        role: admin
251
+        region_name: RegionOne
252
+        username: ranger-admin
253
+        password: password
254
+        project_name: admin
255
+        user_domain_name: default
256
+        project_domain_name: default
249 257
     hosts:
250 258
       default: keystone
251 259
       internal: keystone-api

Loading…
Cancel
Save