aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-26 13:56:25 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-26 13:56:25 -0200
commit07ea0a76f32f4f506a61f75e95970b2bb322ce6b (patch)
treed522c34d6375fbcd284bbe103697cba7ed73a8b9
parentd1f01e93686bb7ff33d480ac08add6728e39a860 (diff)
downloadhydra-07ea0a76f32f4f506a61f75e95970b2bb322ce6b.tar.gz
hydra-07ea0a76f32f4f506a61f75e95970b2bb322ce6b.tar.bz2
Deploy: support bin/deploy from puppet repo
-rw-r--r--lib/hydra/deploy10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index ba66152..68ec9b0 100644
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -59,7 +59,15 @@ function hydra_deploy_setup {
DOMAIN="`echo $FQDN | cut -d . -f 2-`"
ROLE="`hydra_yaml_param nodo::role $HYDRA_FOLDER/puppet/hiera/node/$FQDN.yaml`"
LOCATION="`hydra_yaml_param nodo::location $HYDRA_FOLDER/puppet/hiera/node/$FQDN.yaml`"
- DEPLOY_PUPPET="LC_ALL=C puppet apply $PUPPET_OPTS $PUPPET_MANIFEST"
+
+ # Puppet command
+ if [ -e "$HYDRA_FOLDER/puppet/bin/deploy" ]; then
+ DEPLOY_PUPPET="/etc/puppet/bin/deploy"
+ else
+ DEPLOY_PUPPET="LC_ALL=C puppet apply $PUPPET_OPTS $PUPPET_MANIFEST"
+ fi
+
+ # Deployment command
DEPLOY_APPLY="$DEPLOY_COMMAND $DEPLOY_PUPPET"
# Check for manifest