Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370439 )

Change subject: puppetmaster::puppetdb::client: fix dependencies.
......................................................................

puppetmaster::puppetdb::client: fix dependencies.

As some roles use this setup without apache2 (i.e. the puppet compiler
module) move the notify inside an if guard.

Bug: T172547
Change-Id: Ia1e3d16c027251204d992dea2604ca900c674e19
---
M modules/puppetmaster/manifests/puppetdb/client.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/370439/1

diff --git a/modules/puppetmaster/manifests/puppetdb/client.pp 
b/modules/puppetmaster/manifests/puppetdb/client.pp
index c51bd24..022ffe9 100644
--- a/modules/puppetmaster/manifests/puppetdb/client.pp
+++ b/modules/puppetmaster/manifests/puppetdb/client.pp
@@ -20,7 +20,10 @@
         group  => 'root',
         mode   => '0444',
         source => 'puppet:///modules/puppetmaster/routes.yaml',
-        notify => Service['apache2'],
+    }
+
+    if defined(Service['apache2']) {
+        File['/etc/puppet/routes.yaml'] -> Service['apache2']
     }
 
     # Absence of this directory causes the puppetmaster to spit out

-- 
To view, visit https://gerrit.wikimedia.org/r/370439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1e3d16c027251204d992dea2604ca900c674e19
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to