Merge "Fix minor chart issues due to osh changes"

This commit is contained in:
Zuul 2018-06-01 05:49:25 +00:00 committed by Gerrit Code Review
commit 6ae0d1044e
2 changed files with 6 additions and 7 deletions

View File

@ -28,6 +28,6 @@ data:
USER: {{ .Values.conf.ssh.user | b64enc }}
USER_HOME: {{ .Values.conf.ssh.user_home | b64enc }}
SSH_KEY_FILE: {{ .Values.conf.ssh.ssh_key_file | b64enc }}
RANGER_AGENT_PRIVATE_KEY: {{ .Files.Get .Values.conf.ssh.ssh_key_file_location | b64enc }}
RANGER_AGENT_SSH_CONFIG: {{ .Files.Get .Values.conf.ssh.ssh_config_file_location | b64enc }}
RANGER_AGENT_PRIVATE_KEY: {{ .Values.conf.ssh.ssh_key | default "" | b64enc }}
RANGER_AGENT_SSH_CONFIG: {{ .Values.conf.ssh.ssh_config | default "" | b64enc }}
{{- end }}

View File

@ -93,9 +93,8 @@ conf:
user: ranger_agent
user_home: /home/ranger_agent
ssh_key_file: ranger_agent
ssh_key_file_location: cert/ranger_agent
ssh_config_file_location: cert/config
ssh_key: null
ssh_config: null
network:
api:
ingress:
@ -230,7 +229,7 @@ endpoints:
default: rabbitmq
host_fqdn_override:
default: null
path: /
path: /ranger-agent
scheme: rabbit
port:
amqp:
@ -240,7 +239,7 @@ endpoints:
ranger_rds:
name: rds-url
hosts:
default: rds
default: rds-server
host_fqdn_override:
default: null
path: