diff options
| author | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
| commit | 9198af78956972a01aaf85e19753c5c9e62ea018 (patch) | |
| tree | 7c2c4901c92528b2fababb0e4283d5bec6cd1aef /puppet/modules/site_config/manifests/hosts.pp | |
| parent | 6100b6ded99241f10e7fb12c13a0820fda084912 (diff) | |
| parent | f991e8a4c877cff1d274fd1cac26488f8c3fda84 (diff) | |
Merge tag '0.5.2'
tagging 0.5.2 release
Diffstat (limited to 'puppet/modules/site_config/manifests/hosts.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp index e5d4dd70..6982d37b 100644 --- a/puppet/modules/site_config/manifests/hosts.pp +++ b/puppet/modules/site_config/manifests/hosts.pp @@ -1,9 +1,19 @@ class site_config::hosts() { $hosts = hiera('hosts', false) + + # calculate all the hostname aliases that might be used $hostname = hiera('name') - $domain_hash = hiera('domain') - $domain_public = $domain_hash['full_suffix'] - $api = hiera('api', '') + $domain_hash = hiera('domain', {}) + $dns = hiera('dns', {}) + if $dns['aliases'] == undef { + $dns_aliases = [] + } else { + $dns_aliases = $dns['aliases'] + } + $my_hostnames = unique(sort(concat( + [$hostname, $domain_hash['full'], $domain_hash['internal']], + $dns_aliases + ))) file { '/etc/hostname': ensure => present, |