Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112671
Change subject: Tools: Remove SGE shadow master
......................................................................
Tools: Remove SGE shadow master
We don't use tools-shadow in any meaningful way; it's apparently
neither set up to automatically take over nor, judging from past
experience, it's likely that we need some hot fail-over as most (all?)
SGE snafus so far were not related to a failure in tools-master, but
FS failures, a confused exec node, etc.
Bug: 61190
Change-Id: I85b272c90627f22d91590bb458ef4e50b4ea1c47
---
M manifests/role/labs.pp
M manifests/role/labsbeta.pp
D modules/gridengine/manifests/shadow_master.pp
M modules/toollabs/manifests/master.pp
D modules/toollabs/manifests/shadow.pp
5 files changed, 0 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/112671/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 5361eb5..0252005 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -38,13 +38,6 @@
class { 'toollabs::master': }
}
- class shadow inherits role::labs::tools::config {
- system::role { "role::labs::tools::shadow": description => "Tool Labs
gridengine shadow (backup) master" }
- class { 'toollabs::shadow':
- gridmaster => $grid_master,
- }
- }
-
class webserver inherits role::labs::tools::config {
system::role { "role::labs::tools::webserver": description => "Tool Labs
webserver" }
class { 'toollabs::webserver':
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
index 290ba79..f9ae8ce 100644
--- a/manifests/role/labsbeta.pp
+++ b/manifests/role/labsbeta.pp
@@ -30,13 +30,6 @@
class { 'toollabs::master': }
}
- class shadow inherits role::labs::toolsbeta::config {
- system::role { "role::labs::toolsbeta::shadow": description => "Tool Labs
gridengine shadow (backup) master" }
- class { 'toollabs::shadow':
- gridmaster => $grid_master,
- }
- }
-
class webserver inherits role::labs::toolsbeta::config {
system::role { "role::labs::toolsbeta::webserver": description => "Tool
Labs webserver" }
class { 'toollabs::webserver':
diff --git a/modules/gridengine/manifests/shadow_master.pp
b/modules/gridengine/manifests/shadow_master.pp
deleted file mode 100644
index 1a77edb..0000000
--- a/modules/gridengine/manifests/shadow_master.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# gridengine.pp
-
-
-class gridengine::shadow_master($gridmaster = $grid_master) {
- class { 'gridengine':
- gridmaster => $gridmaster,
- }
-
- package { 'gridengine-master':
- ensure => latest,
- }
-
-# Not actually possible in the labs
-# @@sshkey { $fqdn:
-# ensure => present,
-# type => 'ssh-dss',
-# key => $sshdsakey,
-# tag => "sshkey-$grid_master",
-# }
-}
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index 84c636c..6c7c416 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -16,7 +16,6 @@
toollabs::exec_environ
# TODO: Grid config
- # TODO: (conditional) shadow config
# TODO: project-local NFS (job queue)
diff --git a/modules/toollabs/manifests/shadow.pp
b/modules/toollabs/manifests/shadow.pp
deleted file mode 100644
index a0848d0..0000000
--- a/modules/toollabs/manifests/shadow.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Class: toollabs::shadow
-#
-# This role sets up a grid shadow master in the Tool Labs model.
-#
-# Parameters:
-# gridmaster => FQDN of the gridengine master
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::shadow($gridmaster) inherits toollabs {
- include toollabs::infrastructure,
- toollabs::exec_environ
-
- class { 'gridengine::shadow_master':
- gridmaster => $gridmaster,
- }
-
- # TODO: grid setup
- # TODO: project-local NFS (job queue)
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/112671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85b272c90627f22d91590bb458ef4e50b4ea1c47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
