Cleaning node templates, storage and test nodes on Vagrant, TODO update

diff --git a/TODO.md b/TODO.md
index b61c86cf99efacae4e626b203bb7a8932a0caa6c..49bdab75497c2b3c75c859452dfd631a1507af48 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -4,3 +4,5 @@ TODO
 * Make `config` target:
   * Check if already ran.
   * Fail on empty variables.
+* Node templates:
+  * Update to new nodo style (hiera and nodo::role).

diff --git a/Vagrantfile b/Vagrantfile
index 5a155853f869f502f53ec87e639b719345d305d9..2ea663a675a226c2eaef17d829f86f284935cd8b 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,6 +43,18 @@ Vagrant::Config.run do |config|
     web_config.vm.network :hostonly, "192.168.50.104"
   end
 
+  # Define a Storage VM
+  config.vm.define :storage do |storage_config|
+    storage_config.vm.box = "storage"
+    storage_config.vm.network :hostonly, "192.168.50.105"
+  end
+
+  # Define a Test VM
+  config.vm.define :test do |test_config|
+    test_config.vm.box = "test"
+    test_config.vm.network :hostonly, "192.168.50.106"
+  end
+
   # Share hiera configuration.
   config.vm.share_folder "hiera", "/etc/puppet/hiera", "puppet/hiera", create: true
 end

diff --git a/templates/puppet/master.pp.erb b/templates/puppet/master.pp.erb
index 3f7b4d9c708ab623ac44f2f816750e06e3cd7b22..5865723b1efd2596a5977a7e1e5c4eb20a024f1a 100644 (file)
--- a/templates/puppet/master.pp.erb
+++ b/templates/puppet/master.pp.erb
@@ -2,12 +2,6 @@ node '<%= hostname %>-master.<%= domain %>' {
   $main_master    = true
   include nodo::master
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",

diff --git a/templates/puppet/proxy.pp.erb b/templates/puppet/proxy.pp.erb
index a108a7350b1a49a648c810d41c186a12ef9ddf4e..908c2ec9428f0338dff84ac2cf2c267774f16eb5 100644 (file)
--- a/templates/puppet/proxy.pp.erb
+++ b/templates/puppet/proxy.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-proxy.<%= domain %>' {
 
   include nodo::proxy
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",

diff --git a/templates/puppet/server.pp.erb b/templates/puppet/server.pp.erb
index 9aec40a33344aa6e0ef7f478824439f5bd768b0c..fcd21e0649ea39fa66e294775a256003805308a9 100644 (file)
--- a/templates/puppet/server.pp.erb
+++ b/templates/puppet/server.pp.erb
@@ -34,15 +34,8 @@ node '<%= hostname %>.<%= domain %>' {
   #  memory_limit => 500,
   #}
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10105",
   #}
-
 }

diff --git a/templates/puppet/storage.pp.erb b/templates/puppet/storage.pp.erb
index ab3ddc92d8f6a991b887e8720f97a1d7d1f8bfd1..be93335c46356529db6d5b5e064063efb95fb090 100644 (file)
--- a/templates/puppet/storage.pp.erb
+++ b/templates/puppet/storage.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-storage.<%= domain %>' {
 
   include nodo::storage
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",

diff --git a/templates/puppet/test.pp.erb b/templates/puppet/test.pp.erb
index 0440ee49dccffbe971e679e12f2e18d67859bea1..816eca99ac1a7c03d9f0b4a4f1d5b3f0ce1907c6 100644 (file)
--- a/templates/puppet/test.pp.erb
+++ b/templates/puppet/test.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-test.<%= domain %>' {
 
   include nodo::test
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",

diff --git a/templates/puppet/web.pp.erb b/templates/puppet/web.pp.erb
index 098ec9c8b68befd1950a0e525df501c16f23f841..afc328ba41be6a3fde8d78a28d334cf04752af3a 100644 (file)
--- a/templates/puppet/web.pp.erb
+++ b/templates/puppet/web.pp.erb
@@ -5,12 +5,6 @@ node '<%= hostname %>-web.<%= domain %>' {
 
   include nodo::web
 
-  # encrypted local backups
-  #backup::duplicity { "localhost":
-  #  encryptkey => "ABCDEF12",
-  #  password   => 'xxxyyy',
-  #}
-  
   # encrypted data remote backup
   #backup::rdiff { "other-host":
   #  port   => "10102",