[MediaWiki-commits] [Gerrit] uwsgi: Update Service['uwsgi'] to more accurate Service defs - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223529

Change subject: uwsgi: Update Service['uwsgi'] to more accurate Service defs
......................................................................

uwsgi: Update Service['uwsgi'] to more accurate Service defs

Change-Id: Ic4bb4b3d93ffa01b5dfba5b3c99b8b95a15814af
---
M modules/graphite/manifests/web.pp
M modules/uwsgi/manifests/app.pp
M modules/uwsgi/manifests/init.pp
3 files changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/223529/1

diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 085e56d..68888f2 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -50,13 +50,13 @@
     file { '/etc/graphite/cors.py':
         source  => 'puppet:///modules/graphite/cors.py',
         require => Package['graphite-web'],
-        notify  => Service['uwsgi'],
+        notify  => Service['uwsgi-graphite-web'],
     }
 
     file { '/etc/graphite/local_settings.py':
         content => template('graphite/local_settings.py.erb'),
         require => Package['graphite-web'],
-        notify  => Service['uwsgi'],
+        notify  => Service['uwsgi-graphite-web'],
     }
 
 
diff --git a/modules/uwsgi/manifests/app.pp b/modules/uwsgi/manifests/app.pp
index 77fb3a3..171c393 100644
--- a/modules/uwsgi/manifests/app.pp
+++ b/modules/uwsgi/manifests/app.pp
@@ -41,7 +41,7 @@
             file { $inipath:
                 ensure => link,
                 target => "/etc/uwsgi/apps-available/${basename}.ini",
-                notify => Service['uwsgi'],
+                notify => Service["uwsgi-${title}"],
             }
 
             base::service_unit { "uwsgi-${title}":
@@ -50,12 +50,12 @@
                 systemd       => true,
                 upstart       => true,
             }
-        }
 
-        nrpe::monitor_service { "uwsgi-${title}":
-            description  => "${title} uWSGI web app",
-            nrpe_command => "/usr/sbin/service uwsgi-${title} status",
-            require      => Service['uwsgi'],
+            nrpe::monitor_service { "uwsgi-${title}":
+                description  => "${title} uWSGI web app",
+                nrpe_command => "/usr/sbin/service uwsgi-${title} status",
+                require      => Service["uwsgi-${title}"],
+            }
         }
     }
 }
diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index e060eff..05a9d6c 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -29,6 +29,5 @@
         purge   => true,
         force   => true,
         require => Package['uwsgi', $plugins],
-        notify  => Service['uwsgi'],
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4bb4b3d93ffa01b5dfba5b3c99b8b95a15814af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>

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