aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO.md2
-rw-r--r--Vagrantfile12
-rw-r--r--templates/puppet/master.pp.erb6
-rw-r--r--templates/puppet/proxy.pp.erb6
-rw-r--r--templates/puppet/server.pp.erb7
-rw-r--r--templates/puppet/storage.pp.erb6
-rw-r--r--templates/puppet/test.pp.erb6
-rw-r--r--templates/puppet/web.pp.erb6
8 files changed, 14 insertions, 37 deletions
diff --git a/TODO.md b/TODO.md
index b61c86c..49bdab7 100644
--- 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 5a15585..2ea663a 100644
--- 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 3f7b4d9..5865723 100644
--- 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 a108a73..908c2ec 100644
--- 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 9aec40a..fcd21e0 100644
--- 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 ab3ddc9..be93335 100644
--- 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 0440ee4..816eca9 100644
--- 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 098ec9c..afc328b 100644
--- 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",