Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Disable RESTBase restarts by Puppet on config change
......................................................................


Disable RESTBase restarts by Puppet on config change

When the config/init files change, we do not want Puppet to do an
uncoordinated restart of RESTBase, as that would likely fail. Also, this
protects us from accidental modifications being deployed.

Change-Id: I5161e9d4cbe9f9ac9d116fe28050be4ad9f48d76
---
M modules/restbase/manifests/init.pp
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/restbase/manifests/init.pp 
b/modules/restbase/manifests/init.pp
index 84d4cee..6fbf49f 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -82,7 +82,6 @@
         owner   => 'root',
         group   => 'root',
         mode    => '0444',
-        notify  => Service['restbase'],
     }
 
     file { '/etc/init.d/restbase':
@@ -90,7 +89,7 @@
         owner   => 'root',
         group   => 'root',
         mode    => '0755',
-        notify  => Service['restbase'],
+        require => File['/etc/default/restbase'],
     }
 
     file { '/etc/restbase':
@@ -106,7 +105,6 @@
         owner   => 'root',
         group   => 'root',
         mode    => '0444',
-        notify  => Service['restbase'],
     }
 
     file { '/usr/lib/restbase':
@@ -129,5 +127,9 @@
         hasstatus  => true,
         hasrestart => true,
         provider   => 'init',
+        require    => File[
+            '/etc/restbase/config.yaml',
+            '/etc/init.d/restbase'
+        ],
     }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5161e9d4cbe9f9ac9d116fe28050be4ad9f48d76
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to