Misc fixes (2)

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 928aeccbf27b0b9253f416164b1a617aece464b8..9fdb9e8bcd58396abadc5dfb48e1fb3d83598c68 100644 (file)
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -11,7 +11,7 @@ function hydra_deploy_setup {
     if [ ! -z "$2" ]; then
       NODE="$2"
       DEPLOY_COMMAND="$HYDRA_CONNECT $NODE sudo"
-      DEPLOY_RSYNC="$DEPLOY_RSYNC --rsync-path \"sudo rsync\" $HYDRA_FOLDER/puppet/ $NODE:/etc/puppet/"
+      DEPLOY_RSYNC="$DEPLOY_RSYNC --rsync-path 'sudo rsync' $HYDRA_FOLDER/puppet/ $NODE:/etc/puppet/"
       FQDN="`$DEPLOY_COMMAND facter fqdn`"
       DEPLOY_DEST="$FQDN:"
       DEPLOY_COPY="$DEPLOY_RSYNC"
@@ -53,8 +53,8 @@ function hydra_deploy_setup {
 
   # Common parameters
   DOMAIN="`echo $FQDN | cut -d . -f 2-`"
-  ROLE="`hydra_yaml_param nodo::role $HYDRA_FOLDER/puppet/hiera/$DOMAIN/$FQDN.yaml`"
-  LOCATION="`hydra_yaml_param nodo::location $HYDRA_FOLDER/puppet/hiera/$DOMAIN/$FQDN.yaml`"
+  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="puppet apply $PUPPET_OPTS $PUPPET_MANIFEST"
   DEPLOY_APPLY="$DEPLOY_COMMAND $DEPLOY_PUPPET"