coren has submitted this change and it was merged.
Change subject: Move run_directory into mysql.pp, the only place it is used.
......................................................................
Move run_directory into mysql.pp, the only place it is used.
This fixes a dumb load-order problem.
Change-Id: Id5eb567a433b083708571436b661e4b69f25d2f9
---
M manifests/mysql.pp
M modules/base/manifests/init.pp
2 files changed, 11 insertions(+), 13 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 282268d..4abf026 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -631,22 +631,28 @@
class { "generic::mysql::packages::client": version => $version }
include generic::apparmor::service
- # NOTE: $::run_directory is defined in base.pp
+ # /var/run has moved to /run in newer Ubuntu versions.
+ # See: http://lwn.net/Articles/436012/
+ if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10')
>= 0 {
+ $run_directory = '/run'
+ } else {
+ $run_directory = '/var/run'
+ }
# if $socket was not manually specified,
# assume that the socket file should live in
- # $::run_directory/mysqld/mysqld.sock, otherwise
+ # $run_directory/mysqld/mysqld.sock, otherwise
# just use the path that was given.
$socket_path = $socket ? {
- false => "$::run_directory/mysqld/mysqld.sock",
+ false => "$run_directory/mysqld/mysqld.sock",
default => $socket,
}
# if $pid_file was not manually specified,
# assume that the pid file should live in
- # $::run_directory/mysqld/mysqld.sock, otherwise
+ # $run_directory/mysqld/mysqld.sock, otherwise
# just use the path that was given.
$pid_path = $pid_file ? {
- false => "$::run_directory/mysqld/mysqld.pid",
+ false => "$run_directory/mysqld/mysqld.pid",
default => $pid_file,
}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 6d2ed23..c362d20 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,11 +1,3 @@
-# /var/run has moved to /run in newer Ubuntu versions.
-# See: http://lwn.net/Articles/436012/
-if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10') >= 0 {
- $run_directory = '/run'
-} else {
- $run_directory = '/var/run'
-}
-
class base::access::dc-techs {
# add account and sudoers rules for data center techs
--
To view, visit https://gerrit.wikimedia.org/r/82845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5eb567a433b083708571436b661e4b69f25d2f9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
