Misc fixes

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index d5df1a0f3263d5ed654bdf16d15db415451162ac..928aeccbf27b0b9253f416164b1a617aece464b8 100644 (file)
--- 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

diff --git a/share/hydra/newnode b/share/hydra/newnode
index 7cb7ae44edb72e7f999f9b59ec6e829cface9c4c..16ca402df593ffaba75117b5f54efaa08fca105d 100755 (executable)
--- a/share/hydra/newnode
+++ b/share/hydra/newnode
@@ -61,19 +61,24 @@ else
 fi
 
 # Copy YAML template
-mkdir -p $HYDRA_FOLDER/puppet/hiera/production/domain/$DOMAIN/node
-cp $YAML $HYDRA_FOLDER/puppet/hiera/production/domain/$DOMAIN/node/$NODE.$DOMAIN.yaml
+mkdir -p $HYDRA_FOLDER/puppet/hiera/node
+cp $YAML $HYDRA_FOLDER/puppet/hiera/node/$NODE.$DOMAIN.yaml
+
+# Setup secret YAML template
+mkdir $HYDRA_FOLDER/puppet/hiera/secrets/node
+echo "---" > $HYDRA_FOLDER/puppet/hiera/secrets/node/$NODE.$DOMAIN.yaml
 
 # Copy node template
 mkdir -p $HYDRA_FOLDER/puppet/manifests/nodes
 cp $PP $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.$DOMAIN.pp
 
 # Edit the template
-sed -i -e "s/nodename/$NODE/g"      $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.pp
-sed -i -e "s/example.org/$DOMAIN/g" $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.pp
+sed -i -e "s/nodename/$NODE/g"      $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.$DOMAIN.pp
+sed -i -e "s/example.org/$DOMAIN/g" $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.$DOMAIN.pp
 
 # Add to git
 (
   cd $HYDRA_FOLDER/puppet
-  git add manifests/site.pp manifests/nodes/$NODE.pp hiera/production/domain/$DOMAIN/node/$NODE.$DOMAIN.yaml
+  git add manifests/site.pp manifests/nodes/$NODE.pp hiera/node/$NODE.$DOMAIN.yaml
+  git add manifests/site.pp manifests/nodes/$NODE.pp hiera/secrets/node/$NODE.$DOMAIN.yaml
 )