diff options
| author | elijah <elijah@riseup.net> | 2013-04-01 00:05:42 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-04-01 00:05:42 -0700 |
| commit | 3c41a81f1a3e1757ea6b9bda7e1a98dce624ec1d (patch) | |
| tree | e5e304f25a6a3faf61ed983e16e2894ab3ec1282 | |
| parent | 1d192ab5d42ae4c4c7fdc23b026728d860f14b04 (diff) | |
added setup.pp
| -rw-r--r-- | puppet/manifests/setup.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 5 |
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, |