[MediaWiki-commits] [Gerrit] Assign salt grains for db analytics/sanitarium - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for db analytics/sanitarium
..


Assign salt grains for db analytics/sanitarium

Change-Id: I6b0227eba4639cb37a3e28ab1e3d8b1cc8689c32
---
A hieradata/role/common/mariadb/analytics.yaml
A hieradata/role/common/mariadb/sanitarium.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/mariadb/analytics.yaml 
b/hieradata/role/common/mariadb/analytics.yaml
new file mode 100644
index 000..1bb90aa
--- /dev/null
+++ b/hieradata/role/common/mariadb/analytics.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-analytics:
+value: standard
diff --git a/hieradata/role/common/mariadb/sanitarium.yaml 
b/hieradata/role/common/mariadb/sanitarium.yaml
new file mode 100644
index 000..a53ec5c
--- /dev/null
+++ b/hieradata/role/common/mariadb/sanitarium.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-sanitarium:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 8110f68..602446a 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -51,6 +51,7 @@
 memcached = debdeploy-memcached-codfw:standard, 
debdeploy-memcached-eqiad:standard
 db-parsercache = debdeploy-parsercache:standard
 db-labsdb = debdeploy-labsdb:standard
+db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/248337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b0227eba4639cb37a3e28ab1e3d8b1cc8689c32
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign salt grains for db analytics/sanitarium - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/248337

Change subject: Assign salt grains for db analytics/sanitarium
..

Assign salt grains for db analytics/sanitarium

Change-Id: I6b0227eba4639cb37a3e28ab1e3d8b1cc8689c32
---
A hieradata/role/common/mariadb/analytics.yaml
A hieradata/role/common/mariadb/sanitarium.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/248337/1

diff --git a/hieradata/role/common/mariadb/analytics.yaml 
b/hieradata/role/common/mariadb/analytics.yaml
new file mode 100644
index 000..1bb90aa
--- /dev/null
+++ b/hieradata/role/common/mariadb/analytics.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-analytics:
+value: standard
diff --git a/hieradata/role/common/mariadb/sanitarium.yaml 
b/hieradata/role/common/mariadb/sanitarium.yaml
new file mode 100644
index 000..a53ec5c
--- /dev/null
+++ b/hieradata/role/common/mariadb/sanitarium.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-sanitarium:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 8110f68..602446a 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -51,6 +51,7 @@
 memcached = debdeploy-memcached-codfw:standard, 
debdeploy-memcached-eqiad:standard
 db-parsercache = debdeploy-parsercache:standard
 db-labsdb = debdeploy-labsdb:standard
+db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/248337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b0227eba4639cb37a3e28ab1e3d8b1cc8689c32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits