Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364203 )
Change subject: mariadb:Change instance template identifiers for them to be
dynamic
......................................................................
mariadb:Change instance template identifiers for them to be dynamic
Change references to datadir, socket and tmpdir to datadir_instance,
socket_instance and tmpdir_instance to avoid redefining them.
Add missing tmpdir to the template (it was a bug).
Bug: T169514
Change-Id: I3fac5d92d26c562ce16dc74fc713284e4ba0142c
---
M modules/mariadb/manifests/instance.pp
M modules/mariadb/templates/instance.cnf.erb
2 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/mariadb/manifests/instance.pp
b/modules/mariadb/manifests/instance.pp
index 8a8362d..71fb11e 100644
--- a/modules/mariadb/manifests/instance.pp
+++ b/modules/mariadb/manifests/instance.pp
@@ -7,23 +7,29 @@
$socket = 'undefined',
) {
if $datadir == 'undefined' {
- $datadir = "/srv/sqldata.${title}"
+ $datadir_instance = "/srv/sqldata.${title}"
+ } else {
+ $datadir_instance = $datadir
}
if $tmpdir == 'undefined' {
- $tmpdir = "/srv/tmp.${title}"
+ $tmpdir_instance = "/srv/tmp.${title}"
+ } else {
+ $tmpdir_instance = $tmpdir
}
if $tmpdir == 'undefined' {
- $socket = "/run/mysqld/mysqld.${title}.sock"
+ $socket_instance = "/run/mysqld/mysqld.${title}.sock"
+ } else {
+ $socket_instance = $socket
}
- file { $datadir:
+ file { $datadir_instance:
ensure => directory,
owner => 'mysql',
group => 'mysql',
mode => '0755',
}
- file { $tmpdir:
+ file { $tmpdir_instance:
ensure => directory,
owner => 'mysql',
group => 'mysql',
diff --git a/modules/mariadb/templates/instance.cnf.erb
b/modules/mariadb/templates/instance.cnf.erb
index 9aefd5f..b751daf 100644
--- a/modules/mariadb/templates/instance.cnf.erb
+++ b/modules/mariadb/templates/instance.cnf.erb
@@ -1,4 +1,5 @@
[mysqld@<%= @title %>]
-datadir=<%= @datadir %>
-socket=<%= @socket %>
+datadir=<%= @datadir_instance %>
+tmpdir=<%= @tmpdir_instance %>
+socket=<%= @socket_instance %>
port=<%= @port %>
--
To view, visit https://gerrit.wikimedia.org/r/364203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fac5d92d26c562ce16dc74fc713284e4ba0142c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
