openstack
/
openstack-helm-addons
Code Issues Proposed changes

Merge "Changes to use home directory according to component user"

This commit is contained in:
Zuul 2019-01-26 06:35:20 +00:00 committed by Gerrit Code Review
parent 1765e62acb 999d4bd0e7
commit 256576d85c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ranger/templates/configmap-etc.yaml
View File

@ -26,6 +26,12 @@ limitations under the License.
{{- if empty .Values.conf.ranger.keystone_authtoken.password -}}
{{- $_ := set .Values.conf.ranger.keystone_authtoken "password" .Values.endpoints.identity.auth.ranger.password -}}
{{- end -}}
{{- if empty .Values.conf.ranger.DEFAULT.ranger_base -}}
{{- $_ := set .Values.conf.ranger.DEFAULT "ranger_base" (print .Values.conf.ssh.user_home "/ranger" ) -}}
{{- end -}}
{{- if empty .Values.conf.ranger.rds.repo_local_location -}}
{{- $_ := set .Values.conf.ranger.rds "repo_local_location" (print .Values.conf.ssh.user_home "/git_repo" ) -}}
{{- end -}}
{{- if empty .Values.conf.ranger.keystone_authtoken.project_name -}}
{{- $_ := set .Values.conf.ranger.keystone_authtoken "project_name" .Values.endpoints.identity.auth.ranger.project_name -}}
{{- end -}}

2
ranger/values.yaml
View File

@ -467,7 +467,6 @@ conf:
log_level: INFO
orm_host: 0.0.0.0
pecan_debug: True
ranger_base: '/home/ranger/ranger'
ssl_verify: False
use_handlers: console
ranger_agent_https_enable: False
@ -490,7 +489,6 @@ conf:
auth_enabled: False
rds:
log: null
repo_local_location: /home/ranger/git_repo
repo_remote_location: git@127.0.0.1:/home/repo/ORM.git
repo_user: orm
repo_email: orm@test.com