aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-19 15:00:06 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-19 15:00:06 -0200
commit7b26418c6e5cf39ec3aa7606a6af9e29601c585a (patch)
treeac0a71aa880c0b81ec4d3caa236053e447fc5861 /share
parent7fe06088632486f1c7f349cc4d43a6aa5ce57ed3 (diff)
downloadhydra-7b26418c6e5cf39ec3aa7606a6af9e29601c585a.tar.gz
hydra-7b26418c6e5cf39ec3aa7606a6af9e29601c585a.tar.bz2
Deploy: change copy files procedure to workaround bash quoting limitations
Diffstat (limited to 'share')
-rwxr-xr-xshare/hydra/deploy4
-rwxr-xr-xshare/hydractl/deploy6
2 files changed, 5 insertions, 5 deletions
diff --git a/share/hydra/deploy b/share/hydra/deploy
index 4be5392..d7d4d95 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -37,10 +37,10 @@ for node in $NODES; do
hydra_deploy_mkdirs
# Sync repository to server
- $DEPLOY_RSYNC
+ $DEPLOY_RSYNC "$RSYNC_PATH" $DEPLOY_OPTS
# Copy hiera configuration
- hydra_hiera_copy
+ hydra_deploy_copy_secrets remote
# Check if puppet is installed
$HYDRA_CONNECT $node <<EOF
diff --git a/share/hydractl/deploy b/share/hydractl/deploy
index 6f9de7c..a500a6e 100755
--- a/share/hydractl/deploy
+++ b/share/hydractl/deploy
@@ -28,14 +28,14 @@ if [ ! -z "$FOLDER" ]; then
echo "Deploying to $FOLDER..."
# Setup deploy environment
- hydra_deploy_setup remote $node
+ hydra_deploy_setup folder $FOLDER
hydra_deploy_mkdirs
# Sync repository to server
- $DEPLOY_RSYNC
+ $DEPLOY_RSYNC "$RSYNC_PATH" $DEPLOY_OPTS
# Copy hiera configuration
- hydra_hiera_copy
+ hydra_deploy_copy_secrets folder
# Check if puppet is installed
if [ ! -e "$FOLDER/usr/bin/puppet" ]; then