Jcrespo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404754 )
Change subject: mariadb: Add small tunings in preparation for es200[1234]
reimage
......................................................................
mariadb: Add small tunings in preparation for es200[1234] reimage
They are going to be upgraded to stretch, and that means some
workarounds are no longer needed. Make sure, however, they (2-4) do
not notify, as these are not user-facing services.
Change-Id: I8b912b8be4f16a7423a911aa6fd1115e4ebe89c3
---
A hieradata/hosts/es2002.yaml
A hieradata/hosts/es2003.yaml
A hieradata/hosts/es2004.yaml
M manifests/site.pp
M modules/role/manifests/mariadb/otrsbackups.pp
5 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/404754/1
diff --git a/hieradata/hosts/es2002.yaml b/hieradata/hosts/es2002.yaml
new file mode 100644
index 0000000..5be8031
--- /dev/null
+++ b/hieradata/hosts/es2002.yaml
@@ -0,0 +1 @@
+profile::base::notifications_enabled: '0'
diff --git a/hieradata/hosts/es2003.yaml b/hieradata/hosts/es2003.yaml
new file mode 100644
index 0000000..5be8031
--- /dev/null
+++ b/hieradata/hosts/es2003.yaml
@@ -0,0 +1 @@
+profile::base::notifications_enabled: '0'
diff --git a/hieradata/hosts/es2004.yaml b/hieradata/hosts/es2004.yaml
new file mode 100644
index 0000000..5be8031
--- /dev/null
+++ b/hieradata/hosts/es2004.yaml
@@ -0,0 +1 @@
+profile::base::notifications_enabled: '0'
diff --git a/manifests/site.pp b/manifests/site.pp
index b19ff95..c54bdd1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -777,17 +777,10 @@
# storage on the backup system
node 'es2001.codfw.wmnet' {
role(mariadb::otrsbackups)
- include ::standard
- include ::base::firewall
- # temporary measure until mysql is uninstalled
- include ::mariadb::mysqld_safe
}
node /^es200[234]\.codfw\.wmnet/ {
- include ::standard
- include ::base::firewall
- # temporary measure until mysql is uninstalled
- include ::mariadb::mysqld_safe
+ role(mariadb::core)
}
# Backup system, see T176505.
diff --git a/modules/role/manifests/mariadb/otrsbackups.pp
b/modules/role/manifests/mariadb/otrsbackups.pp
index dae458f..618df02 100644
--- a/modules/role/manifests/mariadb/otrsbackups.pp
+++ b/modules/role/manifests/mariadb/otrsbackups.pp
@@ -1,6 +1,14 @@
class role::mariadb::otrsbackups {
+
+ system::role { 'mariadb::otrsbackups':
+ description => "OTRS backups and generic disk storage",
+ }
+
+ include ::standard
+ include ::base::firewall
include ::profile::backup::host
+ # this needs to be moved to a profile
file { '/srv/backups':
ensure => directory,
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/404754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b912b8be4f16a7423a911aa6fd1115e4ebe89c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
