Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d8ee5188
Commit
d8ee5188
authored
Nov 16, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #17337 from bigeasy/aws-runtime_config
Auto commit by PR queue bot
parents
78065063
c1c789ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
salt-master.sh
cluster/aws/templates/salt-master.sh
+1
-1
No files found.
cluster/aws/templates/salt-master.sh
View file @
d8ee5188
...
@@ -33,7 +33,7 @@ function env_to_salt {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment