Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284276
Change subject: analytics1015 -> analytics1003 migration
......................................................................
analytics1015 -> analytics1003 migration
Bug: T130840
Change-Id: If1f3334f23170e1f5c9603e292d332086bc01549
---
M hieradata/eqiad/cdh/hive.yaml
M hieradata/eqiad/cdh/oozie.yaml
M manifests/site.pp
M modules/role/manifests/analytics_cluster/database/meta.pp
4 files changed, 10 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/284276/1
diff --git a/hieradata/eqiad/cdh/hive.yaml b/hieradata/eqiad/cdh/hive.yaml
index 0b229fa..e5506f2 100644
--- a/hieradata/eqiad/cdh/hive.yaml
+++ b/hieradata/eqiad/cdh/hive.yaml
@@ -1,7 +1,7 @@
#
# Analytics Cluster Hive Configuration
#
-metastore_host: analytics1015.eqiad.wmnet
+metastore_host: analytics1003.eqiad.wmnet
# The WMF webrequest table uses HCatalog's JSON Serde.
# Automatically include this in Hive client classpaths.
diff --git a/hieradata/eqiad/cdh/oozie.yaml b/hieradata/eqiad/cdh/oozie.yaml
index cd38ad0..b0377ff 100644
--- a/hieradata/eqiad/cdh/oozie.yaml
+++ b/hieradata/eqiad/cdh/oozie.yaml
@@ -2,4 +2,4 @@
# Analytics Cluster Oozie Configuration
#
-oozie_host: analytics1015.eqiad.wmnet
\ No newline at end of file
+oozie_host: analytics1003.eqiad.wmnet
\ No newline at end of file
diff --git a/manifests/site.pp b/manifests/site.pp
index ee0bba8..a98e4c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -63,12 +63,17 @@
include base::firewall
}
-# NOTE: This node will be replaced as part of
+# NOTE: This node is being decomissioned.
# https://phabricator.wikimedia.org/T110090.
+node 'analytics1015.eqiad.wmnet' {
+ include standard
+ include base::firewall
+}
+
# This node hosts Oozie and Hive servers,
# as well as a MySQL instance that stores
# meta data associated with those services.
-node 'analytics1015.eqiad.wmnet' {
+node 'analytics1003.eqiad.wmnet' {
role analytics_cluster::client,
analytics_cluster::database::meta,
# Back up analytics-meta MySQL instance
@@ -80,15 +85,6 @@
analytics_cluster::hive::metastore,
analytics_cluster::hive::server,
analytics_cluster::oozie::server
-
- include standard
- include base::firewall
-}
-
-# This node is replacing analytics1015.
-node 'analytics1003.eqiad.wmnet' {
- role analytics_cluster::client,
- analytics_cluster::database::meta
include standard
include base::firewall
diff --git a/modules/role/manifests/analytics_cluster/database/meta.pp
b/modules/role/manifests/analytics_cluster/database/meta.pp
index 7cb49a1..fcfcfd6 100644
--- a/modules/role/manifests/analytics_cluster/database/meta.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta.pp
@@ -8,7 +8,7 @@
class { 'mariadb::packages_wmf':
mariadb10 => true
}
- # TODO: This will be included once analytics1015 has been productionized
+ # TODO: This will be included once analytics1003 has been productionized
# - otto 2015-09-15
#include role::mariadb::monitor
--
To view, visit https://gerrit.wikimedia.org/r/284276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1f3334f23170e1f5c9603e292d332086bc01549
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
