103 lines
3.4 KiB
Diff
103 lines
3.4 KiB
Diff
From 50e5e101857767fa5b20a3f548e3f28ffb8664ed Mon Sep 17 00:00:00 2001
|
|
From: Shuicheng Lin <shuicheng.lin@intel.com>
|
|
Date: Wed, 28 Oct 2020 15:17:34 +0800
|
|
Subject: [PATCH] Add stx_admin account for host to communicate with openstack
|
|
app
|
|
|
|
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
|
|
---
|
|
keystone/templates/job-ks-user.yaml | 18 ++++++++++++++++++
|
|
keystone/templates/secret-keystone.yaml | 2 +-
|
|
keystone/values.yaml | 17 +++++++++++++++++
|
|
3 files changed, 36 insertions(+), 1 deletion(-)
|
|
create mode 100644 keystone/templates/job-ks-user.yaml
|
|
|
|
diff --git a/keystone/templates/job-ks-user.yaml b/keystone/templates/job-ks-user.yaml
|
|
new file mode 100644
|
|
index 0000000..aec4641
|
|
--- /dev/null
|
|
+++ b/keystone/templates/job-ks-user.yaml
|
|
@@ -0,0 +1,18 @@
|
|
+{{/*
|
|
+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 }}
|
|
+{{- $ksUserJob := dict "envAll" . "serviceName" "keystone" "serviceUser" "stx_admin" -}}
|
|
+{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
|
|
+{{- end }}
|
|
diff --git a/keystone/templates/secret-keystone.yaml b/keystone/templates/secret-keystone.yaml
|
|
index 5aa87ab..0e471f1 100644
|
|
--- a/keystone/templates/secret-keystone.yaml
|
|
+++ b/keystone/templates/secret-keystone.yaml
|
|
@@ -14,7 +14,7 @@ limitations under the License.
|
|
|
|
{{- if .Values.manifests.secret_keystone }}
|
|
{{- $envAll := . }}
|
|
-{{- range $key1, $userClass := tuple "admin" "test" }}
|
|
+{{- range $key1, $userClass := tuple "admin" "test" "stx_admin" }}
|
|
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
|
|
---
|
|
apiVersion: v1
|
|
diff --git a/keystone/values.yaml b/keystone/values.yaml
|
|
index 473379d..68bbcdd 100644
|
|
--- a/keystone/values.yaml
|
|
+++ b/keystone/values.yaml
|
|
@@ -146,6 +146,10 @@ dependencies:
|
|
services:
|
|
- endpoint: internal
|
|
service: oslo_db
|
|
+ ks_user:
|
|
+ services:
|
|
+ - endpoint: internal
|
|
+ service: identity
|
|
rabbit_init:
|
|
services:
|
|
- service: oslo_messaging
|
|
@@ -1062,6 +1066,7 @@ secrets:
|
|
identity:
|
|
admin: keystone-keystone-admin
|
|
test: keystone-keystone-test
|
|
+ stx_admin: keystone-keystone-stxadmin
|
|
oslo_db:
|
|
admin: keystone-db-admin
|
|
keystone: keystone-db-user
|
|
@@ -1104,6 +1109,17 @@ endpoints:
|
|
user_domain_name: default
|
|
project_domain_name: default
|
|
default_domain_id: default
|
|
+ stx_admin:
|
|
+ role:
|
|
+ - admin
|
|
+ - member
|
|
+ region_name: RegionOne
|
|
+ username: stx_admin
|
|
+ password: password
|
|
+ project_name: admin
|
|
+ user_domain_name: default
|
|
+ project_domain_name: default
|
|
+ default_domain_id: default
|
|
test:
|
|
role: admin
|
|
region_name: RegionOne
|
|
@@ -1254,6 +1270,7 @@ manifests:
|
|
job_domain_manage: true
|
|
job_fernet_setup: true
|
|
job_image_repo_sync: true
|
|
+ job_ks_user: true
|
|
job_rabbit_init: true
|
|
pdb_api: true
|
|
pod_rally_test: true
|
|
--
|
|
2.7.4
|