| commit | 89541f4378bd0c9b66ce5daa6d699712177f5b42 | [log] [tgz] |
|---|---|---|
| author | Petr Michalec <epcim@apealive.net> | Thu Aug 17 14:21:26 2017 +0200 |
| committer | GitHub <noreply@github.com> | Thu Aug 17 14:21:26 2017 +0200 |
| tree | 90ef50f1dfd3bdac05180aba88e6332bc1b81021 | |
| parent | b444ef9180402ba411aafdb8fcda12f0471bbe53 [diff] | |
| parent | 2e3a499c39cd47970dc115a1ca46c99599ab5778 [diff] |
Merge pull request #9 from salt-formulas/add-master-hostname-default Add default master_hostname
diff --git a/bootstrap.sh b/bootstrap.sh index c589d6a..0cac518 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}