summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-08-21 17:12:55 -0400
committerMicah Anderson <micah@leap.se>2014-08-21 17:12:55 -0400
commitaa2645c97d0e983e21e271c7cab26f36609e85fe (patch)
tree44f01fb23d1053d44c55d35f95255bb42341a880 /puppet/modules/site_config/manifests
parentc62c9c2e63cfc82fc57f321609e407cfeabd9cdf (diff)
parent271c37a151d8e786b29ef7f5c13217693ec65401 (diff)
Merge tag '0.5.3'
Tagging 0.5.3 release
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp7
1 files changed, 3 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 6982d37b..e43ad45e 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -10,10 +10,9 @@ class site_config::hosts() {
} else {
$dns_aliases = $dns['aliases']
}
- $my_hostnames = unique(sort(concat(
- [$hostname, $domain_hash['full'], $domain_hash['internal']],
- $dns_aliases
- )))
+ $my_hostnames = unique(concat(
+ $dns_aliases, [$hostname, $domain_hash['full'], $domain_hash['internal']]
+ ))
file { '/etc/hostname':
ensure => present,