summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/setup.pp4
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp5
2 files changed, 6 insertions, 3 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
new file mode 100644
index 00000000..b45c8b4c
--- /dev/null
+++ b/puppet/manifests/setup.pp
@@ -0,0 +1,4 @@
+#
+# this is applied before each run of site.pp
+#
+include site_config::hosts \ No newline at end of file
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 6c00f3b6..81795f7d 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -1,9 +1,8 @@
class site_config::hosts() {
-
$hosts = hiera('hosts','')
$hostname = hiera('name')
-
- $domain_public = $site_config::default::domain_hash['full_suffix']
+ $domain_hash = hiera('domain')
+ $domain_public = $domain_hash['full_suffix']
file { "/etc/hostname":
ensure => present,