diff options
author | Micah Anderson <micah@riseup.net> | 2012-12-11 16:25:11 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2012-12-11 16:25:11 -0500 |
commit | a3f11bff64069e61df895d8bb9d5d80fdde0e7eb (patch) | |
tree | e4fd2395892e80bc39333ba0c4e037198ee421cc /puppet | |
parent | efb434fff348ee38ce688851791a91a1814240e7 (diff) |
set up an 'initial' run stage to happen before the 'main' run stage and put the
site_config::hosts to be in the initial run stage to make sure the hostname is
set before anything else.
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_config/manifests/init.pp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp index dd8d7e47..1312f870 100644 --- a/puppet/modules/site_config/manifests/hosts.pp +++ b/puppet/modules/site_config/manifests/hosts.pp @@ -1,4 +1,4 @@ -class site_config::hosts { +class site_config::hosts() { $hosts = hiera('hosts','') $hostname = hiera('name') diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp index 268ff2fc..bab186d0 100644 --- a/puppet/modules/site_config/manifests/init.pp +++ b/puppet/modules/site_config/manifests/init.pp @@ -13,5 +13,11 @@ class site_config { include site_config::resolvconf # configure /etc/hosts - include site_config::hosts + stage { 'initial': + before => Stage['main'], + } + + class { 'site_config::hosts': + stage => initial, + } } |