Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391610 )
Change subject: misc PHP apps: convert roles to profiles
......................................................................
misc PHP apps: convert roles to profiles
Change-Id: I28381702cdae2ea4fc5fa02ef97ab923e175b2b3
---
M manifests/site.pp
R modules/profile/kafka/analytics/burrow.pp
R modules/profile/manifests/grafana/production.pp
R modules/profile/manifests/iegreview.pp
R modules/profile/manifests/wikimania_scholarships.pp
R modules/profile/racktables.pp
A modules/role/manifests/webserver_misc_apps.pp
7 files changed, 26 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/391610/1
diff --git a/manifests/site.pp b/manifests/site.pp
index c1212dd..74196a1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1241,12 +1241,7 @@
# virtual machine for misc. PHP apps
node 'krypton.eqiad.wmnet' {
- # kafka::analytics::burrow is a Kafka consumer lag monitor.
- # Running this here because krypton is a 'misc' Jessie
- # <s>monitoring host</s> (not really, it's just misc apps)
- role(wikimania_scholarships, iegreview::app, grafana::production,
- kafka::analytics::burrow, racktables)
- include ::standard
+ role(webserver_misc_apps)
}
node /kubernetes[12]00[1-4]\.(codfw|eqiad)\.wmnet/ {
diff --git a/modules/role/manifests/kafka/analytics/burrow.pp
b/modules/profile/kafka/analytics/burrow.pp
similarity index 83%
rename from modules/role/manifests/kafka/analytics/burrow.pp
rename to modules/profile/kafka/analytics/burrow.pp
index 0c348cd..e8d79d3 100644
--- a/modules/role/manifests/kafka/analytics/burrow.pp
+++ b/modules/profile/kafka/analytics/burrow.pp
@@ -1,8 +1,8 @@
-# == Class role::kafka::analytics::burrow
-# Role classes for burrow, a consumer offset lag monitoring tool
+# == Class profile::kafka::analytics::burrow
+# Profile clas for burrow, a consumer offset lag monitoring tool
# for Kafka.
#
-class role::kafka::analytics::burrow {
+class profile::kafka::analytics::burrow {
$config = kafka_config('analytics')
diff --git a/modules/role/manifests/grafana/production.pp
b/modules/profile/manifests/grafana/production.pp
similarity index 97%
rename from modules/role/manifests/grafana/production.pp
rename to modules/profile/manifests/grafana/production.pp
index 8652123..42a1ce7 100644
--- a/modules/role/manifests/grafana/production.pp
+++ b/modules/profile/manifests/grafana/production.pp
@@ -3,7 +3,7 @@
# Grafana is a dashboarding webapp for Graphite.
# It powers <https://grafana.wikimedia.org>.
#
-class role::grafana::production {
+class profile::grafana::production {
include ::passwords::grafana::production
class { '::role::grafana::base':
diff --git a/modules/role/manifests/iegreview/app.pp
b/modules/profile/manifests/iegreview.pp
similarity index 86%
rename from modules/role/manifests/iegreview/app.pp
rename to modules/profile/manifests/iegreview.pp
index 3398f71..62ed6c1 100644
--- a/modules/role/manifests/iegreview/app.pp
+++ b/modules/profile/manifests/iegreview.pp
@@ -1,10 +1,8 @@
-# = Class: role::iegreview::app
+# = Class: role::iegreview
#
# This class provisions the IEG grant review application.
#
-class role::iegreview::app {
-
- include ::profile::base::firewall
+class profile::iegreview {
class { '::iegreview':
hostname => 'iegreview.wikimedia.org',
diff --git a/modules/role/manifests/wikimania_scholarships.pp
b/modules/profile/manifests/wikimania_scholarships.pp
similarity index 90%
rename from modules/role/manifests/wikimania_scholarships.pp
rename to modules/profile/manifests/wikimania_scholarships.pp
index c70fc2f..b973081 100644
--- a/modules/role/manifests/wikimania_scholarships.pp
+++ b/modules/profile/manifests/wikimania_scholarships.pp
@@ -2,9 +2,7 @@
#
# This class sets up the Wikimania Scholarships application
#
-class role::wikimania_scholarships {
-
- include ::profile::base::firewall
+class profile::wikimania_scholarships {
class { '::wikimania_scholarships':
hostname => 'scholarships.wikimedia.org',
diff --git a/modules/role/manifests/racktables.pp
b/modules/profile/racktables.pp
similarity index 87%
rename from modules/role/manifests/racktables.pp
rename to modules/profile/racktables.pp
index 9b315ce..66782d9 100644
--- a/modules/role/manifests/racktables.pp
+++ b/modules/profile/racktables.pp
@@ -5,11 +5,10 @@
## the installation at this time & the actual tarball must be downloaded from
## http://racktables.org/ and unzipped into /srv/org/wikimedia/racktables
#
-class role::racktables {
+class profile::racktables {
system::role { 'racktables': description => 'Racktables server' }
include ::standard
- include ::profile::base::firewall
include ::profile::racktables
}
diff --git a/modules/role/manifests/webserver_misc_apps.pp
b/modules/role/manifests/webserver_misc_apps.pp
new file mode 100644
index 0000000..61f272a
--- /dev/null
+++ b/modules/role/manifests/webserver_misc_apps.pp
@@ -0,0 +1,17 @@
+# a webserver for misc. (PHP) apps
+class role::webserver_misc_apps {
+
+ system::role { 'webserver_misc_apps':
+ description => 'WMF misc apps web server'
+ }
+
+ include ::standard
+ include ::profile::base::firewall
+
+ include ::profile::wikimania_scholarhips
+ include ::profile::iegreview
+ include ::profile::grafana::production
+ include ::profile::kafka::analytics::burrow # kafka::analytics::burrow is
a Kafka consumer lag monitor
+ include ::profile::racktables
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/391610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28381702cdae2ea4fc5fa02ef97ab923e175b2b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
