| commit | 02a48c6feee3b82b4f1dd459399246f0c0869814 | [log] [tgz] |
|---|---|---|
| author | Petr Michalec <epcim@apealive.net> | Thu Aug 17 20:42:05 2017 +0200 |
| committer | GitHub <noreply@github.com> | Thu Aug 17 20:42:05 2017 +0200 |
| tree | e70c83b10ea43a2cf5f158f454b54f7fbcab6fb9 | |
| parent | 89541f4378bd0c9b66ce5daa6d699712177f5b42 [diff] | |
| parent | d81d1f5ebf56b60f942499d1a2e266cae41b0774 [diff] |
Merge pull request #10 from salt-formulas/update-minimal-sm-config update minmal SM config
diff --git a/bootstrap.sh b/bootstrap.sh index cf0dfea..804d326 100755 --- a/bootstrap.sh +++ b/bootstrap.sh
@@ -75,6 +75,7 @@ # salt export SALT_MASTER=${SALT_MASTER:-127.0.0.1} # ip or fqdn export MINION_ID=${MINION_ID:-${HOSTNAME}.${DOMAIN}} +export MASTER_HOSTNAME=${MASTER_HOSTNAME:-${HOSTNAME}.${DOMAIN}} # saltstack BOOTSTRAP_SALTSTACK=${BOOTSTRAP_SALTSTACK:-True}