D2848.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2848.diff
View Options

	diff --git a/roles/paas-docker/containers/sentry.sls b/roles/paas-docker/containers/sentry.sls
	--- a/roles/paas-docker/containers/sentry.sls
	+++ b/roles/paas-docker/containers/sentry.sls
	@@ -29,7 +29,7 @@
	- makedirs: True
	- context:
	links: {{ args['links'] }}
	- credential_key: args['credential']
	+ credential_key: {{ args['credential'] }}

	{% if has_selinux %}
	selinux_context_{{ realm }}_sentry_data:
	diff --git a/roles/paas-docker/salt/files/credential.sh b/roles/paas-docker/salt/files/credential.sh
	--- a/roles/paas-docker/salt/files/credential.sh
	+++ b/roles/paas-docker/salt/files/credential.sh
	@@ -19,4 +19,4 @@
	exit 1
	fi

	-sudo salt-call credentials.get_password "$1" --out=json \| jq .local
	+sudo salt-call credentials.get_password "$1" --out=json \| jq -r .local
	diff --git a/roles/paas-docker/salt/init.sls b/roles/paas-docker/salt/init.sls
	--- a/roles/paas-docker/salt/init.sls
	+++ b/roles/paas-docker/salt/init.sls
	@@ -26,6 +26,10 @@
	# Wrapper to fetch a credential
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	+credential_dependencies:
	+ pkg.installed:
	+ - name: jq
	+
	{{ dirs.bin }}/credential:
	file.managed:
	- source: salt://roles/paas-docker/salt/files/credential.sh