aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-19 13:20:21 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-19 13:20:21 -0200
commit8b9c9827522a28d197c543faca52cdb6ea238d81 (patch)
tree2ca302d1a26dc94be21450c40885765c6d476766 /lib
parent7fd68eec9d6925c868094d60eddfc4ca8d762ad2 (diff)
downloadhydra-8b9c9827522a28d197c543faca52cdb6ea238d81.tar.gz
hydra-8b9c9827522a28d197c543faca52cdb6ea238d81.tar.bz2
Misc fixes
Diffstat (limited to 'lib')
-rw-r--r--lib/hydra/deploy6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index d5df1a0..928aecc 100644
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -53,9 +53,9 @@ function hydra_deploy_setup {
# Common parameters
DOMAIN="`echo $FQDN | cut -d . -f 2-`"
- ROLE="`hydra_yaml_param nodo::role $HYDRA_FOLDER/$DOMAIN/$FQDN.yaml`"
- LOCATION="`hydra_yaml_param nodo::location $HYDRA_FOLDER/$DOMAIN/$FQDN.yaml`"
- DEPLOY_PUPPET="puppet appy $PUPPET_OPTS $PUPPET_MANIFEST"
+ 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`"
+ DEPLOY_PUPPET="puppet apply $PUPPET_OPTS $PUPPET_MANIFEST"
DEPLOY_APPLY="$DEPLOY_COMMAND $DEPLOY_PUPPET"
# Check for manifest