openstack
/
openstack-helm-addons
Code Issues Proposed changes

Fix minor chart issues due to osh changes 

Incorporated to Pass git key and config through value

Signed-off-by: Hari Om Singh<hosingh000@gmail.com>

Change-Id: I2ebc86ce0fe371379468c0482e705773a553e517
This commit is contained in:
hosingh000 2018-05-10 13:53:58 -05:00 committed by Pete Birley
parent c1a96769e4
commit fca50096dc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ranger-agent/templates/secret-ssh-key.yaml
View File

@ -28,6 +28,6 @@ data:
USER: {{ .Values.conf.ssh.user | b64enc }} USER: {{ .Values.conf.ssh.user | b64enc }}
USER_HOME: {{ .Values.conf.ssh.user_home | b64enc }} USER_HOME: {{ .Values.conf.ssh.user_home | b64enc }}
SSH_KEY_FILE: {{ .Values.conf.ssh.ssh_key_file | 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_PRIVATE_KEY: {{ .Values.conf.ssh.ssh_key | default "" | b64enc }}
RANGER_AGENT_SSH_CONFIG: {{ .Files.Get .Values.conf.ssh.ssh_config_file_location | b64enc }} RANGER_AGENT_SSH_CONFIG: {{ .Values.conf.ssh.ssh_config | default "" | b64enc }}
{{- end }} {{- end }}

9
ranger-agent/values.yaml
View File

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