saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set the grains file in the proper place if found on the provided temporary configuration directory.

Browse source 
Refs saltstack/salt#5849
Refs saltstack/salt-cloud#672
This commit is contained in:
Pedro Algarvio 2013-07-02 16:33:30 +01:00
parent 1543fdf81e
commit da0d58132b
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bootstrap-salt.sh
View file

@ -2738,6 +2738,13 @@ config_salt() {
[ -d $SALT_ETC_DIR ] || mkdir $SALT_ETC_DIR || return 1
[ -d $PKI_DIR ] || mkdir -p $PKI_DIR && chmod 700 $PKI_DIR || return 1
# Copy the grains file if found
if [ -f "$TEMP_CONFIG_DIR/grains" ]; then
echodebug "Moving provided grains file from $TEMP_CONFIG_DIR/grains to $SALT_ETC_DIR/grains"
movefile "$TEMP_CONFIG_DIR/grains" "$SALT_ETC_DIR/grains" || return 1
CONFIGURED_ANYTHING=$BS_TRUE
fi
if [ $INSTALL_MINION -eq $BS_TRUE ]; then
# Create the PKI directory
[ -d $PKI_DIR/minion ] || mkdir -p $PKI_DIR/minion && chmod 700 $PKI_DIR/minion || return 1