github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17337 from bigeasy/aws-runtime_config

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-16 17:05:46 -08:00
commit d8ee518859
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/templates/salt-master.sh
View File

@ -33,7 +33,7 @@ function env_to_salt {
local value=${!env_key} local value=${!env_key}
if [[ -n "${value}" ]]; then if [[ -n "${value}" ]]; then
# Note this is yaml, so indentation matters # Note this is yaml, so indentation matters
cat <<EOF # >>/etc/salt/minion.d/grains.conf cat <<EOF >>/etc/salt/minion.d/grains.conf
${key}: '$(echo "${value}" | sed -e "s/'/''/g")' ${key}: '$(echo "${value}" | sed -e "s/'/''/g")'
EOF EOF
fi fi