Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104219
Change subject: Tools: Remove obsolete tyrant class/role
......................................................................
Tools: Remove obsolete tyrant class/role
Change-Id: I639206cbfb03a705f9861134eae819ca8d630bad
---
M manifests/role/labs.pp
M modules/toollabs/manifests/exec_environ.pp
D modules/toollabs/manifests/tyrant.pp
3 files changed, 0 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/104219/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 58e1f8f..418bc0f 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -80,12 +80,5 @@
}
}
- class tyrant inherits role::labs::tools::config {
- system::role { "role::labs::tools::tyrant": description => "Tool Labs
UWSGI emperor" }
- class { 'toollabs::tyrant':
- gridmaster => $grid_master,
- }
- }
-
} # class role::labs::tools
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index c4ff43b..5327e9c 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -156,7 +156,6 @@
'python-sqlalchemy',
'python-twitter',
'python-twisted',
- 'python-uwsgi',
'python-virtualenv',
'python-wadllib',
'python-webpy',
diff --git a/modules/toollabs/manifests/tyrant.pp
b/modules/toollabs/manifests/tyrant.pp
deleted file mode 100644
index 8c9298b..0000000
--- a/modules/toollabs/manifests/tyrant.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Class: toollabs::tyrant
-#
-# This role sets up a node as an UWSGI tyrant
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::tyrant($gridmaster) inherits toollabs {
- include toollabs::infrastructure,
- toollabs::exec_environ
- class { 'gridengine::submit_host':
- gridmaster => $gridmaster,
- }
-
- file { "${store}/submithost-${fqdn}":
- ensure => file,
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => File[$store],
- content => "${ipaddress}\n",
- }
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/104219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I639206cbfb03a705f9861134eae819ca8d630bad
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
