[MediaWiki-commits] [Gerrit] Use role-specific Exec to manage wikimedia-task-appserver's ... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Use role-specific Exec to manage wikimedia-task-appserver's 
apache
......................................................................

Use role-specific Exec to manage wikimedia-task-appserver's apache

Stop the service via a role-specific Exec resource rather than a Service.
This is just for now; we can and should refactor this so that Apache is never
provisioned in the first place.

Change-Id: I07ce98456d8074b79150852d99a87037a429b3c7
---
M manifests/role/mediawiki.pp
1 file changed, 15 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/133996/1

diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 6d600bc..58abb54 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -166,9 +166,9 @@
 
         # Load the class just like the role::mediawiki::imagescaler
         # role.
-        include imagescaler::cron,
-            imagescaler::packages,
-            imagescaler::files
+        include ::imagescaler::cron,
+            ::imagescaler::packages,
+            ::imagescaler::files
 
         # Beta application servers have some ferm DNAT rewriting rules (bug
         # 45868) so we have to explicitly allow http (port 80)
@@ -201,18 +201,18 @@
 
         # When adding class there, please also update the appserver::beta
         # class which mix both webserver and imagescaler roles.
-        include imagescaler::cron,
-            imagescaler::packages,
-            imagescaler::files
+        include ::imagescaler::cron,
+            ::imagescaler::packages,
+            ::imagescaler::files
     }
     class videoscaler( $run_jobs_enabled = true ){
         system::role { "role::mediawiki::videoscaler": description => "TMH 
Jobrunner Server" }
 
         include role::mediawiki::common
 
-        include imagescaler::cron,
-            imagescaler::packages,
-            imagescaler::files
+        include ::imagescaler::cron,
+            ::imagescaler::packages,
+            ::imagescaler::files
 
         class {"::mediawiki::jobrunner":
             run_jobs_enabled => $run_jobs_enabled,
@@ -229,10 +229,9 @@
             role::mediawiki::configuration::php
 
         # dependency for wikimedia-task-appserver
-        service { 'apache':
-            name => "apache2",
-            enable => false,
-            ensure => stopped;
+        exec { 'videoscaler-apache-service-stopped':
+            command => '/etc/init.d/apache2 stop',
+            onlyif  => '/etc/init.d/apache2 status',
         }
     }
     class jobrunner( $run_jobs_enabled = true ){
@@ -263,10 +262,9 @@
             role::mediawiki::configuration::php
 
         # dependency for wikimedia-task-appserver
-            service { 'apache':
-                name => "apache2",
-                enable => false,
-                ensure => stopped;
+        exec { 'jobrunner-apache-service-stopped':
+            command => '/etc/init.d/apache2 stop',
+            onlyif  => '/etc/init.d/apache2 status',
         }
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07ce98456d8074b79150852d99a87037a429b3c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>

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