diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 2 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 650c63b16..4b88ab7bb 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -176,7 +176,7 @@ parse_yaml() { s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs="$(echo @|tr @ '\034')" - sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ + sed -e 's|---||g' -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ -e "s|^\($s\)\($w\)$s[:-]$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" | awk -F"$fs" '{ indent = length($1)/2; diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index f184bcde6..4effa6b4f 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -60,8 +60,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END salt -C 'I@salt:master' state.sls linux salt -C '* and not cfg01*' state.sls linux + salt -C '* and not cfg01*' pkg.upgrade refresh=False salt '*' state.sls ntp - - salt '*' pkg.upgrade refresh=False SALT_INSTALL_END |