Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391610 )
Change subject: grafana,racktables,scholarships,iegreview: role to profiles ...................................................................... grafana,racktables,scholarships,iegreview: role to profiles Change-Id: I28381702cdae2ea4fc5fa02ef97ab923e175b2b3 --- R hieradata/common/profile/racktables.yaml A hieradata/role/common/webserver_misc_apps.yaml M manifests/site.pp R modules/profile/manifests/grafana/production.pp R modules/profile/manifests/iegreview.pp M modules/profile/manifests/racktables.pp R modules/profile/manifests/wikimania_scholarships.pp D modules/role/manifests/racktables.pp A modules/role/manifests/webserver_misc_apps.pp 9 files changed, 34 insertions(+), 34 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/common/racktables.yaml b/hieradata/common/profile/racktables.yaml similarity index 61% rename from hieradata/role/common/racktables.yaml rename to hieradata/common/profile/racktables.yaml index 6039a56..29d1350 100644 --- a/hieradata/role/common/racktables.yaml +++ b/hieradata/common/profile/racktables.yaml @@ -1,3 +1 @@ -standard::has_default_mail_relay: false - profile::racktables::racktables_host: 'racktables.wikimedia.org' diff --git a/hieradata/role/common/webserver_misc_apps.yaml b/hieradata/role/common/webserver_misc_apps.yaml new file mode 100644 index 0000000..7ad0377 --- /dev/null +++ b/hieradata/role/common/webserver_misc_apps.yaml @@ -0,0 +1 @@ +standard::has_default_mail_relay: false diff --git a/manifests/site.pp b/manifests/site.pp index 6cb0ac1..7ddfa76 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1240,14 +1240,16 @@ } -# virtual machine for misc. PHP apps +# virtual machine for misc. applications +# (as opposed to static sites using 'webserver_misc_static') +# +# profile::wikimania_scholarships - https://scholarships.wikimedia.org/ +# profile::iegreview - https://iegreview.wikimedia.org +# profile::grafana::production - https://grafana.wikimedia.org +# profile::racktables - https://racktables.wikimedia.org +# kafka::analytics::burrow is a Kafka consumer lag monitor 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,kafka::analytics::burrow) } node /kubernetes[12]00[1-4]\.(codfw|eqiad)\.wmnet/ { diff --git a/modules/role/manifests/grafana/production.pp b/modules/profile/manifests/grafana/production.pp similarity index 94% rename from modules/role/manifests/grafana/production.pp rename to modules/profile/manifests/grafana/production.pp index 8652123..1386ed8 100644 --- a/modules/role/manifests/grafana/production.pp +++ b/modules/profile/manifests/grafana/production.pp @@ -1,9 +1,9 @@ -# == Class: role::grafana::production +# == Class: profile::grafana::production # # 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..23f9a9d 100644 --- a/modules/role/manifests/iegreview/app.pp +++ b/modules/profile/manifests/iegreview.pp @@ -1,10 +1,8 @@ -# = Class: role::iegreview::app +# = Class: profile::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/profile/manifests/racktables.pp b/modules/profile/manifests/racktables.pp index 670a63e..3811289 100644 --- a/modules/profile/manifests/racktables.pp +++ b/modules/profile/manifests/racktables.pp @@ -8,7 +8,9 @@ class profile::racktables ( $racktables_host = hiera('profile::racktables::racktables_host'), ){ + system::role { 'racktables': description => 'Racktables server' } + include ::standard include ::apache include ::apache::mod::php5 include ::apache::mod::ssl diff --git a/modules/role/manifests/wikimania_scholarships.pp b/modules/profile/manifests/wikimania_scholarships.pp similarity index 85% rename from modules/role/manifests/wikimania_scholarships.pp rename to modules/profile/manifests/wikimania_scholarships.pp index c70fc2f..73ee618 100644 --- a/modules/role/manifests/wikimania_scholarships.pp +++ b/modules/profile/manifests/wikimania_scholarships.pp @@ -1,10 +1,8 @@ -# = Class: role::wikimania_scholarships +# = Class: profile::wikimania_scholarships # # 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/role/manifests/racktables.pp deleted file mode 100644 index 9b315ce..0000000 --- a/modules/role/manifests/racktables.pp +++ /dev/null @@ -1,15 +0,0 @@ -# https://racktables.wikimedia.org - -## Please note that Racktables is a tarball extraction based installation -## into its web directory root. This means that puppet cannot fully automate -## 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 { - - 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..2551297 --- /dev/null +++ b/modules/role/manifests/webserver_misc_apps.pp @@ -0,0 +1,16 @@ +# a webserver for misc. apps +# (as opposed to static websites using webserver_misc_static) +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_scholarships # https://scholarships.wikimedia.org + include ::profile::iegreview # https://iegreview.wikimedia.org + include ::profile::grafana::production # https://grafana.wikimedia.org + include ::profile::racktables # https://racktables.wikimedia.org +} -- To view, visit https://gerrit.wikimedia.org/r/391610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28381702cdae2ea4fc5fa02ef97ab923e175b2b3 Gerrit-PatchSet: 16 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
