Updates newnode to new scheme

diff --git a/share/config/templates/node/nodo.pp b/share/config/templates/node/nodo.example.org.pp
similarity index 100%
rename from share/config/templates/node/nodo.pp
rename to share/config/templates/node/nodo.example.org.pp

diff --git a/share/config/templates/node/nodo.example.org.yaml b/share/config/templates/node/nodo.example.org.yaml
index 56bce8934f7ba501f162f49592ea38a902da7d52..02a3beadc26117f0b527a2ec3a5c34f91980282a 100644 (file)
--- a/share/config/templates/node/nodo.example.org.yaml
+++ b/share/config/templates/node/nodo.example.org.yaml
@@ -1,5 +1,5 @@
 ---
-nodo::role: 'vserver'
+nodo::role: 'virtual'
 
 #
 # Backup

diff --git a/share/hydra/newnode b/share/hydra/newnode
index e5ab9a90f9d3d7ee730937c19fa3ed7483ef2641..95829a13538fb8fd74416ba9827f1ca8a650407c 100755 (executable)
--- a/share/hydra/newnode
+++ b/share/hydra/newnode
@@ -44,7 +44,7 @@ fi
 DOMAIN="`cat $HYDRA_FOLDER/config/domain`"
 
 # Create node
-echo "import \"nodes/$NODE.pp\"" >> $NODES
+echo "import \"nodes/$NODE.$DOMAIN.pp\"" >> $NODES
 
 # Set YAML template
 if [ -e "$HYDRA_FOLDER/config/templates/node/nodo.example.org.yaml" ]; then
@@ -55,9 +55,9 @@ fi
 
 # Set node template
 if [ -e "$HYDRA_FOLDER/config/templates/node/nodo.pp" ]; then
-  PP="$HYDRA_FOLDER/config/templates/node/nodo.pp"
+  PP="$HYDRA_FOLDER/config/templates/node/nodo.example.org.pp"
 else
-  PP="$APP_BASE/share/config/templates/node/nodo.pp"
+  PP="$APP_BASE/share/config/templates/node/nodo.example.org.pp"
 fi
 
 # Copy YAML template
@@ -66,7 +66,7 @@ cp $YAML $HYDRA_FOLDER/puppet/hiera/production/domain/$DOMAIN/node/$NODE.$DOMAIN
 
 # Copy node template
 mkdir -p $HYDRA_FOLDER/puppet/manifests/nodes
-cp $PP $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.pp
+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