Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334452 )
Change subject: Testreduce: allow to decide the state of the services
......................................................................
Testreduce: allow to decide the state of the services
* Temporary stop parsoid-vd and parsoid-vd-client services
Bug: T156177
Change-Id: I5dab4415739fcda1f5c27b82ef13c0fab9efdc1e
---
M modules/role/manifests/parsoid/vd_client.pp
M modules/role/manifests/parsoid/vd_server.pp
M modules/testreduce/manifests/client.pp
M modules/testreduce/manifests/server.pp
4 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Mobrovac: Looks good to me, but someone else must approve
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/modules/role/manifests/parsoid/vd_client.pp
b/modules/role/manifests/parsoid/vd_client.pp
index bc7cb3d..9277c17 100644
--- a/modules/role/manifests/parsoid/vd_client.pp
+++ b/modules/role/manifests/parsoid/vd_client.pp
@@ -5,5 +5,6 @@
testreduce::client { 'parsoid-vd-client':
instance_name => 'parsoid-vd-client',
+ service_state => stopped,
}
}
diff --git a/modules/role/manifests/parsoid/vd_server.pp
b/modules/role/manifests/parsoid/vd_server.pp
index 6d40184..821382c 100644
--- a/modules/role/manifests/parsoid/vd_server.pp
+++ b/modules/role/manifests/parsoid/vd_server.pp
@@ -13,6 +13,7 @@
db_pass => $passwords::testreduce::mysql::db_pass,
webapp_port => 8010,
coord_port => 8011,
+ service_state => stopped,
}
}
diff --git a/modules/testreduce/manifests/client.pp
b/modules/testreduce/manifests/client.pp
index ffcf516..3059b18 100644
--- a/modules/testreduce/manifests/client.pp
+++ b/modules/testreduce/manifests/client.pp
@@ -6,7 +6,8 @@
# Name of the testreduce client service
#
define testreduce::client(
- $instance_name
+ $instance_name,
+ $service_state = running,
) {
file { "/etc/testreduce/${instance_name}.config.js":
content => template("testreduce/${instance_name}.config.js.erb"),
@@ -25,6 +26,6 @@
}
service { $instance_name:
- ensure => running,
+ ensure => $service_state,
}
}
diff --git a/modules/testreduce/manifests/server.pp
b/modules/testreduce/manifests/server.pp
index e06554a..8992f36 100644
--- a/modules/testreduce/manifests/server.pp
+++ b/modules/testreduce/manifests/server.pp
@@ -29,10 +29,11 @@
$db_name,
$db_user,
$db_pass,
- $db_host = 'localhost',
- $db_port = 3306,
- $coord_port = 8002,
- $webapp_port = 8003,
+ $db_host = 'localhost',
+ $db_port = 3306,
+ $coord_port = 8002,
+ $webapp_port = 8003,
+ $service_state = running,
) {
file { "/etc/testreduce/${instance_name}.settings.js":
# FIXME: Ideally this would be testreduce/settings.js.rb
@@ -54,7 +55,7 @@
}
service { $instance_name:
- ensure => running,
+ ensure => $service_state,
require => [
File["/etc/testreduce/${instance_name}.settings.js"],
File["/lib/systemd/system/${instance_name}.service"],
--
To view, visit https://gerrit.wikimedia.org/r/334452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5dab4415739fcda1f5c27b82ef13c0fab9efdc1e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
