Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Include standard for the new mariadb roles. Remove duplicate
includes added previously to node definitions.
......................................................................
Include standard for the new mariadb roles.
Remove duplicate includes added previously to node definitions.
Change-Id: I5610eae10a0a0a8b30b6cf10390d27c58b606ad8
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 83cbdd7..c567ac3 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -8,6 +8,7 @@
description => 'database server',
}
+ include standard
include mariadb
}
@@ -21,6 +22,7 @@
description => 'beta cluster database server',
}
+ include standard
include mariadb::packages
include passwords::misc::scripts
@@ -42,6 +44,7 @@
description => 'tendril database server',
}
+ include standard
include mariadb::packages_wmf
include passwords::misc::scripts
@@ -69,6 +72,7 @@
# No packages yet! MariaDB 10 beta tarball in /opt
#include mariadb::packages
+ include standard
include passwords::misc::scripts
class { 'mariadb::config':
@@ -96,6 +100,7 @@
mariadb10 => true,
}
+ include standard
include passwords::misc::scripts
class { 'mariadb::config':
diff --git a/manifests/site.pp b/manifests/site.pp
index 998ac52..2773139 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -803,12 +803,10 @@
}
node 'db1044.eqiad.wmnet' {
- include standard
include role::mariadb::tendril
}
node /^dbstore100(1|2)\.eqiad\.wmnet/ {
- include standard
include role::mariadb::dbstore
}
--
To view, visit https://gerrit.wikimedia.org/r/130046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5610eae10a0a0a8b30b6cf10390d27c58b606ad8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <sprin...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
