Configurator refactor

diff --git a/TODO.md b/TODO.md
index 165eb3d087543c2ae884da36c2b490f8a1aa36bd..b61c86cf99efacae4e626b203bb7a8932a0caa6c 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -3,4 +3,4 @@ TODO
 
 * Make `config` target:
   * Check if already ran.
-  * Refactor `configurator.pp`.
+  * Fail on empty variables.

diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp
index ce6073151f82fda666900997d61e1f38129ffadc..56f234fe31617f3917c06eff92d883f745fec2f5 100644 (file)
--- a/manifests/bootstrap/configurator.pp
+++ b/manifests/bootstrap/configurator.pp
@@ -12,7 +12,9 @@
 # Basic variables
 #
 $templates              = "$bootstrap_path/templates"
-$base_domain            = hiera('bootstrap::base_domain',                 'example.org')
+$base_domain            = hiera('bootstrap::base_domain',                 "${::domain}")
+$first_hostname         = hiera('bootstrap::first_hostname',              "${::hostname}")
+$first_nodes            = hiera('bootstrap::first_nodes',                 'absent')
 $db_password            = hiera('nodo::role::master::db_password',        'changeme')
 $mysql_rootpw           = hiera('mysql::server::rootpw',                  '')
 $root_password          = hiera('bootstrap::root:password',               'rootpass')
@@ -133,51 +135,50 @@ file { "$bootstrap_path/modules/site_postfix/files/tls_policy":
 #
 # Basic nodes
 #
-#file { "$bootstrap_path/manifests/nodes.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/nodes.pp.erb"),
-#}
-
-## First host
-#file { "$bootstrap_path/manifests/nodes/$hostname.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/server.pp.erb"),
-#}
-#
-## Master node
-#file { "$bootstrap_path/manifests/nodes/$hostname-master.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/master.pp.erb"),
-#}
-#
-## Proxy node
-#file { "$bootstrap_path/manifests/nodes/$hostname-proxy.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/proxy.pp.erb"),
-#}
-#
-## Web node
-#file { "$bootstrap_path/manifests/nodes/$hostname-web.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/web.pp.erb"),
-#}
-#
-## Storage node
-#file { "$bootstrap_path/manifests/nodes/$hostname-storage.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/storage.pp.erb"),
-#}
-#
-## Test node
-#file { "$bootstrap_path/manifests/nodes/$hostname-test.pp":
-#  ensure  => present,
-#  mode    => 0644,
-#  content => template("$templates/puppet/test.pp.erb"),
-#}
-#
+file { "$bootstrap_path/manifests/nodes.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/nodes.pp.erb"),
+}
+
+# First host
+file { "$bootstrap_path/manifests/nodes/$first_hostname.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/server.pp.erb"),
+}
+
+# Master node
+file { "$bootstrap_path/manifests/nodes/$first_hostname-master.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/master.pp.erb"),
+}
+
+# Proxy node
+file { "$bootstrap_path/manifests/nodes/$first_hostname-proxy.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/proxy.pp.erb"),
+}
+
+# Web node
+file { "$bootstrap_path/manifests/nodes/$first_hostname-web.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/web.pp.erb"),
+}
+
+# Storage node
+file { "$bootstrap_path/manifests/nodes/$first_hostname-storage.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/storage.pp.erb"),
+}
+
+# Test node
+file { "$bootstrap_path/manifests/nodes/$first_hostname-test.pp":
+  ensure  => $first_nodes,
+  mode    => 0644,
+  content => template("$templates/puppet/test.pp.erb"),
+}

diff --git a/templates/puppet/nodes.pp.erb b/templates/puppet/nodes.pp.erb
index 15290d8b0dc41243ba9c8bcda8c3d0cef05fd5e6..4acddc6c2e7fae341e71b44efde047711484628e 100644 (file)
--- a/templates/puppet/nodes.pp.erb
+++ b/templates/puppet/nodes.pp.erb
@@ -1,6 +1,14 @@
-import "nodes/<%= hostname %>.pp"
-import "nodes/<%= hostname %>-master.pp"
-import "nodes/<%= hostname %>-proxy.pp"
-import "nodes/<%= hostname %>-web.pp"
-import "nodes/<%= hostname %>-storage.pp"
-import "nodes/<%= hostname %>-test.pp"
+#
+# Node definitions.
+#
+
+<%- if first_nodes == 'present' then -%>
+import "nodes/<%= first_hostname %>.pp"
+import "nodes/<%= first_hostname %>-master.pp"
+import "nodes/<%= first_hostname %>-proxy.pp"
+import "nodes/<%= first_hostname %>-web.pp"
+import "nodes/<%= first_hostname %>-storage.pp"
+import "nodes/<%= first_hostname %>-test.pp"
+<%- else -%>
+#import "nodes/example.pp"
+<%- end -%>