[MediaWiki-commits] [Gerrit] remove db1008, it has moved to frack - change (operations/puppet)

[Jgreen (Code Review)]

Jgreen has uploaded a new change for review.

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


Change subject: remove db1008, it has moved to frack
......................................................................

remove db1008, it has moved to frack

Change-Id: I662e6c9808b3cd6f00d67422fd70845c6c723d00
---
M manifests/decommissioning.pp
M manifests/mysql.pp
M manifests/role/coredb.pp
M manifests/site.pp
4 files changed, 2 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/76002/1

diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index f4cd015..a390145 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -61,6 +61,7 @@
 'db30',
 'db41',
 'db78', #moved to frack.eqiad 7-15-13
+'db1008', #moved to frack.eqiad 7-25-13
 'db1013', #moved to frack.eqiad 6-7-13
 'dysprosium',
 'ixia',
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index f41cb75..ebdbf94 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -25,9 +25,6 @@
        if $hostname =~ /^blondel|bellin$/ {
                $db_cluster = "m1"
        }
-       elsif $hostname =~ /^db1008$/ {
-               $db_cluster = "fundraisingdb"
-       }
        else {
                $db_cluster = undef
        }
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 4fea6fa..f5e3590 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -112,14 +112,6 @@
                        'snapshot' => [ "es10", "es1010" ],
                        'no_master' => []
                },
-               'fundraisingdb' => {
-                       'hosts' => { 'pmtpa' => [ 'db78' ],
-                               'eqiad' => ['db1008'] },
-                       'primary_site' => $::mw_primary,
-                       'masters' => { 'eqiad' => "db1025" },
-                       'snapshot' => [],
-                       'no_master' => []
-               },
        }
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index becf342..cf38195 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -556,8 +556,6 @@
 
 node "db78.pmtpa.wmnet" {
     # moved to frack puppet
-    #include role::fundraising::database::dump_slave
-    #class { 'misc::fundraising::backup::archive_sync': hour => [4,12,20], 
minute => 5 }
 }
 
 ## researchdb
@@ -672,13 +670,8 @@
     include role::coredb::m2
 }
 
-## eqiad fundraising DBs
 node "db1008.eqiad.wmnet" {
-    include mysql_wmf::mysqluser,
-        mysql_wmf::datadirs,
-        mysql_wmf::packages,
-        mysql_wmf::conf,
-        role::fundraising::database::slave
+    # moved to frack puppet
 }
 
 ## researchdb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I662e6c9808b3cd6f00d67422fd70845c6c723d00
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <jgr...@wikimedia.org>

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