jenkins-bot has submitted this change and it was merged.
Change subject: Set services to start on boot
......................................................................
Set services to start on boot
Setting `enable => true` for a Puppet service resource tells Puppet to
configure the service to start automatically on boot. This is necessary
because `ensure => 'running'` will only take effect during a Puppet run
which is not an automatic or periodic function in MediaWiki-Vagrant.
Bug: T96231
Change-Id: Ib0e8843d4fe586c83d89f0929f7c803787551372
---
M puppet/modules/activemq/manifests/init.pp
M puppet/modules/graphoid/manifests/init.pp
M puppet/modules/hhvm/manifests/init.pp
M puppet/modules/mathoid/manifests/init.pp
M puppet/modules/mediawiki/manifests/jobrunner.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/phabricator/manifests/init.pp
M puppet/modules/role/manifests/fundraising.pp
M puppet/modules/role/manifests/poolcounter.pp
M puppet/modules/rsyslog/manifests/init.pp
M puppet/modules/sentry/manifests/init.pp
M puppet/modules/smtplog/manifests/init.pp
M puppet/modules/xvfb/manifests/init.pp
14 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/activemq/manifests/init.pp
b/puppet/modules/activemq/manifests/init.pp
index 8e9d92a..d6df86f 100644
--- a/puppet/modules/activemq/manifests/init.pp
+++ b/puppet/modules/activemq/manifests/init.pp
@@ -49,6 +49,7 @@
}
service { 'activemq':
+ enable => true,
ensure => running,
provider => 'upstart',
require => [
diff --git a/puppet/modules/graphoid/manifests/init.pp
b/puppet/modules/graphoid/manifests/init.pp
index 0b279a1..4bc801a 100644
--- a/puppet/modules/graphoid/manifests/init.pp
+++ b/puppet/modules/graphoid/manifests/init.pp
@@ -52,6 +52,7 @@
}
service { 'graphoid':
+ enable => true,
ensure => running,
hasstatus => true,
hasrestart => true,
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index a70bfd4..e2d8ace 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -135,6 +135,7 @@
}
service { 'hhvm':
+ enable => true,
ensure => running,
provider => upstart,
require => File['/etc/init/hhvm.conf'],
diff --git a/puppet/modules/mathoid/manifests/init.pp
b/puppet/modules/mathoid/manifests/init.pp
index 35c544e..c15184b 100644
--- a/puppet/modules/mathoid/manifests/init.pp
+++ b/puppet/modules/mathoid/manifests/init.pp
@@ -52,6 +52,7 @@
}
service { 'mathoid':
+ enable => true,
ensure => running,
hasstatus => true,
hasrestart => true,
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index 86bfe55..36918a8 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -54,6 +54,7 @@
}
service { 'jobrunner':
+ enable => true,
ensure => 'running',
provider => 'upstart',
require => Mediawiki::Wiki[$::mediawiki::wiki_name],
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp
b/puppet/modules/mediawiki/manifests/parsoid.pp
index e35fdad..6a491ca 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -67,6 +67,7 @@
}
service { 'parsoid':
+ enable => true,
ensure => running,
provider => 'upstart',
subscribe => File['localsettings.js', '/etc/init/parsoid.conf'],
diff --git a/puppet/modules/mysql/manifests/init.pp
b/puppet/modules/mysql/manifests/init.pp
index bf410d2..d015b97 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -26,6 +26,7 @@
include ::mysql::packages
service { 'mysql':
+ enable => true,
ensure => running,
hasrestart => true,
require => Package['mysql-server'],
diff --git a/puppet/modules/phabricator/manifests/init.pp
b/puppet/modules/phabricator/manifests/init.pp
index 32e1e86..1780106 100644
--- a/puppet/modules/phabricator/manifests/init.pp
+++ b/puppet/modules/phabricator/manifests/init.pp
@@ -79,6 +79,7 @@
$phd = "${deploy_dir}/phabricator/bin/phd"
service { 'phd':
+ enable => true,
ensure => running,
provider => base,
binary => $phd,
diff --git a/puppet/modules/role/manifests/fundraising.pp
b/puppet/modules/role/manifests/fundraising.pp
index 80ae5e7..06441e0 100644
--- a/puppet/modules/role/manifests/fundraising.pp
+++ b/puppet/modules/role/manifests/fundraising.pp
@@ -13,6 +13,7 @@
$rsyslog_max_message_size = '64k'
service { 'rsyslog':
+ enable => true,
ensure => running,
provider => 'init',
hasrestart => true,
diff --git a/puppet/modules/role/manifests/poolcounter.pp
b/puppet/modules/role/manifests/poolcounter.pp
index 5e2509f..cf3e635 100644
--- a/puppet/modules/role/manifests/poolcounter.pp
+++ b/puppet/modules/role/manifests/poolcounter.pp
@@ -7,6 +7,7 @@
require_package('poolcounter')
service { 'poolcounter':
+ enable => true,
ensure => 'running',
require => Package['poolcounter'],
}
diff --git a/puppet/modules/rsyslog/manifests/init.pp
b/puppet/modules/rsyslog/manifests/init.pp
index 627016f..ea2ae7e 100644
--- a/puppet/modules/rsyslog/manifests/init.pp
+++ b/puppet/modules/rsyslog/manifests/init.pp
@@ -23,6 +23,7 @@
}
service { 'rsyslog':
+ enable => true,
ensure => running,
provider => 'upstart',
require => Package['rsyslog'],
diff --git a/puppet/modules/sentry/manifests/init.pp
b/puppet/modules/sentry/manifests/init.pp
index a1b62b5..afd623d 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -155,6 +155,7 @@
}
service { 'sentry':
+ enable => true,
ensure => running,
provider => 'upstart',
require => [Virtualenv::Environment[$deploy_dir],
Mysql::User[$db_user]],
diff --git a/puppet/modules/smtplog/manifests/init.pp
b/puppet/modules/smtplog/manifests/init.pp
index cf9306c..11a686c 100644
--- a/puppet/modules/smtplog/manifests/init.pp
+++ b/puppet/modules/smtplog/manifests/init.pp
@@ -22,6 +22,7 @@
}
service { 'smtplog':
+ enable => true,
ensure => running,
provider => 'upstart',
require => File['/etc/init/smtplog.conf'],
diff --git a/puppet/modules/xvfb/manifests/init.pp
b/puppet/modules/xvfb/manifests/init.pp
index ca1b3cf..1516372 100644
--- a/puppet/modules/xvfb/manifests/init.pp
+++ b/puppet/modules/xvfb/manifests/init.pp
@@ -47,6 +47,7 @@
}
service { 'xvfb':
+ enable => true,
ensure => running,
provider => 'upstart',
require => File['/etc/init/xvfb.conf'],
--
To view, visit https://gerrit.wikimedia.org/r/205811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0e8843d4fe586c83d89f0929f7c803787551372
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
