From fb8774be70b691b8b085a3cfadee5e28f21902ac Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 11 Sep 2015 23:15:25 -0300
Subject: Updates newnode to new scheme

---
 share/config/templates/node/nodo.example.org.pp   | 3 +++
 share/config/templates/node/nodo.example.org.yaml | 2 +-
 share/config/templates/node/nodo.pp               | 3 ---
 share/hydra/newnode                               | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 share/config/templates/node/nodo.example.org.pp
 delete mode 100644 share/config/templates/node/nodo.pp

diff --git a/share/config/templates/node/nodo.example.org.pp b/share/config/templates/node/nodo.example.org.pp
new file mode 100644
index 0000000..1d6cdf6
--- /dev/null
+++ b/share/config/templates/node/nodo.example.org.pp
@@ -0,0 +1,3 @@
+node 'nodename.example.org' {
+  include nodo
+}
diff --git a/share/config/templates/node/nodo.example.org.yaml b/share/config/templates/node/nodo.example.org.yaml
index 56bce89..02a3bea 100644
--- 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/config/templates/node/nodo.pp b/share/config/templates/node/nodo.pp
deleted file mode 100644
index 1d6cdf6..0000000
--- a/share/config/templates/node/nodo.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-node 'nodename.example.org' {
-  include nodo
-}
diff --git a/share/hydra/newnode b/share/hydra/newnode
index e5ab9a9..95829a1 100755
--- 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
-- 
cgit v1.2.3