aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/deploy18
1 files changed, 10 insertions, 8 deletions
diff --git a/bin/deploy b/bin/deploy
index 518e03a..f23bc42 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -7,12 +7,17 @@
DIRNAME="`dirname $0`"
BASEDIR="$DIRNAME/.."
+# Install dependencies
+source $DIRNAME/dependencies
+
# Determine hostname
-if [ ! -z "$1" ]; then
- FQDN="$1"
-else
- FQDN="`cat /etc/hostname`"
-fi
+#if [ ! -z "$1" ]; then
+# FQDN="$1"
+#else
+# FQDN="`cat /etc/hostname`"
+#fi
+#FQDN="`facter fqdn`"
+FQDN="`cat /etc/hostname`"
# Set manifest
PUPPET_MANIFEST="$BASEDIR/manifests/nodes/$FQDN.pp"
@@ -26,9 +31,6 @@ if [ ! -e "$PUPPET_MANIFEST" ]; then
exit 1
fi
-# Install dependencies
-source $DIRNAME/dependencies
-
# Ensure additional dependencies are installed.
for package in $DEPLOY_DEPENDENCIES; do
provision_package $package