diff options
| -rw-r--r-- | lib/hydra/deploy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/hydra/deploy b/lib/hydra/deploy index 928aecc..9fdb9e8 100644 --- 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" |