Include admin tenant user
Change-Id: I762b6c4260095a61a55f5ad6e70ec58e0f922704
This commit is contained in:
parent
64bf5981a1
commit
77f41c71a3
|
@ -0,0 +1,20 @@
|
||||||
|
{{/*
|
||||||
|
Copyright 2017 The Openstack-Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/}}
|
||||||
|
|
||||||
|
{{- if .Values.manifests.job_ks_user_ranger }}
|
||||||
|
{{- $ksUserJob := dict "envAll" . "serviceName" "ranger-agent" "serviceUser" "ranger_admin" -}}
|
||||||
|
{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
|
||||||
|
{{- end }}
|
|
@ -16,7 +16,7 @@ limitations under the License.
|
||||||
|
|
||||||
{{- if .Values.manifests.secret_keystone }}
|
{{- if .Values.manifests.secret_keystone }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- range $key1, $userClass := tuple "admin" "ranger" "ranger_agent" }}
|
{{- range $key1, $userClass := tuple "admin" "ranger" "ranger_admin" "ranger_agent" }}
|
||||||
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
|
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
|
|
@ -261,7 +261,8 @@ pod:
|
||||||
secrets:
|
secrets:
|
||||||
identity:
|
identity:
|
||||||
admin: admin
|
admin: admin
|
||||||
ranger: ranger-admin
|
ranger: ranger-service-admin
|
||||||
|
ranger_admin: ranger-admin
|
||||||
ranger_agent: ranger-agent-admin
|
ranger_agent: ranger-agent-admin
|
||||||
oslo_db:
|
oslo_db:
|
||||||
admin: ranger-agent-db-admin
|
admin: ranger-agent-db-admin
|
||||||
|
@ -323,6 +324,14 @@ endpoints:
|
||||||
project_name: service
|
project_name: service
|
||||||
user_domain_name: default
|
user_domain_name: default
|
||||||
project_domain_name: default
|
project_domain_name: default
|
||||||
|
ranger_admin:
|
||||||
|
role: admin
|
||||||
|
region_name: RegionOne
|
||||||
|
username: ranger-admin
|
||||||
|
password: password
|
||||||
|
project_name: admin
|
||||||
|
user_domain_name: default
|
||||||
|
project_domain_name: default
|
||||||
hosts:
|
hosts:
|
||||||
default: keystone
|
default: keystone
|
||||||
internal: keystone-api
|
internal: keystone-api
|
||||||
|
|
|
@ -246,6 +246,14 @@ endpoints:
|
||||||
project_name: service
|
project_name: service
|
||||||
user_domain_name: default
|
user_domain_name: default
|
||||||
project_domain_name: default
|
project_domain_name: default
|
||||||
|
ranger_admin:
|
||||||
|
role: admin
|
||||||
|
region_name: RegionOne
|
||||||
|
username: ranger-admin
|
||||||
|
password: password
|
||||||
|
project_name: admin
|
||||||
|
user_domain_name: default
|
||||||
|
project_domain_name: default
|
||||||
hosts:
|
hosts:
|
||||||
default: keystone
|
default: keystone
|
||||||
internal: keystone-api
|
internal: keystone-api
|
||||||
|
|
Loading…
Reference in New Issue