diff options
| author | Christoph Kluenter <ckluente@thoughtworks.com> | 2014-09-29 14:31:54 +0200 |
|---|---|---|
| committer | Christoph Kluenter <ckluente@thoughtworks.com> | 2014-09-29 14:33:56 +0200 |
| commit | 664dca31dec0c7935ee96359209d9dcefc03e38c (patch) | |
| tree | 48073521403ea03ac27fd77dd0ceb2970c079e58 /puppet/modules | |
| parent | 63ca770b6913d674db639c486a8ba215ea0b7a65 (diff) | |
ensure dhclicent and resolv.conf are configured before bigcouch
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_config/manifests/dhclient.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/bigcouch.pp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/dhclient.pp b/puppet/modules/site_config/manifests/dhclient.pp index 7ac0caf3..dbe2ef1c 100644 --- a/puppet/modules/site_config/manifests/dhclient.pp +++ b/puppet/modules/site_config/manifests/dhclient.pp @@ -17,7 +17,9 @@ class site_config::dhclient { exec { 'reload_dhclient': refreshonly => true, - command => '/usr/local/sbin/reload_dhclient'; + command => '/usr/local/sbin/reload_dhclient', + before => Class['site_config::resolvconf'], + require => File['/usr/local/sbin/reload_dhclient'], } file { '/etc/dhcp/dhclient-enter-hooks.d/disable_resolvconf': diff --git a/puppet/modules/site_couchdb/manifests/bigcouch.pp b/puppet/modules/site_couchdb/manifests/bigcouch.pp index f0aab734..d3352000 100644 --- a/puppet/modules/site_couchdb/manifests/bigcouch.pp +++ b/puppet/modules/site_couchdb/manifests/bigcouch.pp @@ -17,6 +17,7 @@ class site_couchdb::bigcouch { # stunnel must running correctly before bigcouch dbs can be set up. # Class['site_config::default'] + -> Class['site_config::resolvconf'] -> Class['couchdb::bigcouch::package::cloudant'] -> Service['shorewall'] -> Service['stunnel'] |