Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/140654
Change subject: swift: lint
......................................................................
swift: lint
Change-Id: Ibc919a3bb52254f5ae2a0a98f3ad3eceee950990
---
M manifests/role/swift.pp
1 file changed, 126 insertions(+), 110 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/140654/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 1716050..ccbeea4 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -1,115 +1,131 @@
# vim: noet
-@monitor_group { "swift": description => "swift servers" }
+@monitor_group { 'swift':
+ description => 'swift servers',
+}
class role::swift {
- class base {
- include standard
- }
+ class base {
+ include standard
+ }
- class eqiad-prod inherits role::swift::base {
- system::role { "role::swift::eqiad-prod": description => "Swift
eqiad production cluster" }
- include passwords::swift::eqiad_prod
- class { "::swift::base": hash_path_suffix =>
"4f93c548a5903a13", cluster_name => "eqiad-prod" }
- class ganglia_reporter inherits role::swift::eqiad-prod {
- # one host per cluster should report global stats
- file {
"/usr/local/bin/swift-ganglia-report-global-stats":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
"puppet:///files/swift/swift-ganglia-report-global-stats",
- }
- # config file to hold the password
- $password =
$passwords::swift::eqiad_prod::rewrite_password
- file { "/etc/swift-ganglia-report-global-stats.conf":
- owner => 'root',
- group => 'root',
- mode => '0440',
- content =>
template("swift/swift-ganglia-report-global-stats.conf.erb"),
- }
- cron { "swift-ganglia-report-global-stats":
- ensure => present,
- command =>
"/usr/local/bin/swift-ganglia-report-global-stats -C
/etc/swift-ganglia-report-global-stats.conf -u 'mw:media' -c eqiad-prod",
- user => root,
- }
- }
- class proxy inherits role::swift::eqiad-prod {
- class { "::swift::proxy":
- statsd_host => 'statsd.eqiad.wmnet',
- statsd_metric_prefix =>
"swift.eqiad-prod.${::hostname}",
- statsd_default_sample_rate => '0.1',
- bind_port => "80",
- proxy_address => "http://ms-fe.eqiad.wmnet";,
- num_workers => $::processorcount,
- memcached_servers => [
"ms-fe1001.eqiad.wmnet:11211", "ms-fe1002.eqiad.wmnet:11211",
"ms-fe1003.eqiad.wmnet:11211", "ms-fe1004.eqiad.wmnet:11211" ],
- auth_backend => 'tempauth',
- super_admin_key =>
$passwords::swift::eqiad_prod::super_admin_key,
- rewrite_account => 'AUTH_mw',
- rewrite_password =>
$passwords::swift::eqiad_prod::rewrite_password,
- rewrite_thumb_server =>
"rendering.svc.eqiad.wmnet",
- shard_container_list =>
"wikipedia-commons-local-thumb,wikipedia-de-local-thumb,wikipedia-en-local-thumb,wikipedia-fi-local-thumb,wikipedia-fr-local-thumb,wikipedia-he-local-thumb,wikipedia-hu-local-thumb,wikipedia-id-local-thumb,wikipedia-it-local-thumb,wikipedia-ja-local-thumb,wikipedia-ro-local-thumb,wikipedia-ru-local-thumb,wikipedia-th-local-thumb,wikipedia-tr-local-thumb,wikipedia-uk-local-thumb,wikipedia-zh-local-thumb,wikipedia-commons-local-public,wikipedia-de-local-public,wikipedia-en-local-public,wikipedia-fi-local-public,wikipedia-fr-local-public,wikipedia-he-local-public,wikipedia-hu-local-public,wikipedia-id-local-public,wikipedia-it-local-public,wikipedia-ja-local-public,wikipedia-ro-local-public,wikipedia-ru-local-public,wikipedia-th-local-public,wikipedia-tr-local-public,wikipedia-uk-local-public,wikipedia-zh-local-public,wikipedia-commons-local-temp,wikipedia-de-local-temp,wikipedia-en-local-temp,wikipedia-fi-local-temp,wikipedia-fr-local-temp,wikipedia-he-local-temp,wikipedia-hu-local-temp,wikipedia-id-local-temp,wikipedia-it-local-temp,wikipedia-ja-local-temp,wikipedia-ro-local-temp,wikipedia-ru-local-temp,wikipedia-th-local-temp,wikipedia-tr-local-temp,wikipedia-uk-local-temp,wikipedia-zh-local-temp,wikipedia-commons-local-transcoded,wikipedia-de-local-transcoded,wikipedia-en-local-transcoded,wikipedia-fi-local-transcoded,wikipedia-fr-local-transcoded,wikipedia-he-local-transcoded,wikipedia-hu-local-transcoded,wikipedia-id-local-transcoded,wikipedia-it-local-transcoded,wikipedia-ja-local-transcoded,wikipedia-ro-local-transcoded,wikipedia-ru-local-transcoded,wikipedia-th-local-transcoded,wikipedia-tr-local-transcoded,wikipedia-uk-local-transcoded,wikipedia-zh-local-transcoded,global-data-math-render",
- backend_url_format => "sitelang"
- }
- class { '::swift::proxy::monitoring':
- host => 'ms-fe.eqiad.wmnet',
- }
- }
- class storage inherits role::swift::eqiad-prod {
- include ::swift::storage
- include ::swift::storage::monitoring
- }
- }
- class esams-prod inherits role::swift::base {
- system::role { "role::swift::esams-prod": description => "Swift
esams production cluster" }
- include passwords::swift::esams_prod
- class { "::swift::base": hash_path_suffix =>
"a0af6563d361f968", cluster_name => "esams-prod" }
- class ganglia_reporter inherits role::swift::esams-prod {
- # one host per cluster should report global stats
- file {
"/usr/local/bin/swift-ganglia-report-global-stats":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
"puppet:///files/swift/swift-ganglia-report-global-stats",
- }
- # config file to hold the password
- $password =
$passwords::swift::esams_prod::rewrite_password
- file { "/etc/swift-ganglia-report-global-stats.conf":
- owner => 'root',
- group => 'root',
- mode => '0440',
- content =>
template("swift/swift-ganglia-report-global-stats.conf.erb"),
- }
- cron { "swift-ganglia-report-global-stats":
- ensure => present,
- command =>
"/usr/local/bin/swift-ganglia-report-global-stats -C
/etc/swift-ganglia-report-global-stats.conf -u 'mw:media' -c esams-prod",
- user => root,
- }
- }
- class proxy inherits role::swift::esams-prod {
- class { "::swift::proxy":
- statsd_host => 'statsd.eqiad.wmnet',
- statsd_metric_prefix =>
"swift.esams-prod.${::hostname}",
- statsd_default_sample_rate => '0.1',
- bind_port => "80",
- proxy_address => "http://ms-fe.esams.wmnet";,
- num_workers => $::processorcount,
- memcached_servers => [
"ms-fe3001.esams.wmnet:11211", "ms-fe3002.esams.wmnet:11211" ],
- auth_backend => 'tempauth',
- super_admin_key =>
$passwords::swift::esams_prod::super_admin_key,
- rewrite_account => 'AUTH_mw',
- rewrite_password =>
$passwords::swift::esams_prod::rewrite_password,
- rewrite_thumb_server => "upload.wikimedia.org",
- shard_container_list => "",
- backend_url_format => "asis"
- }
- class { '::swift::proxy::monitoring':
- host => 'ms-fe.esams.wmnet',
- }
- }
- class storage inherits role::swift::esams-prod {
- include ::swift::storage
- include ::swift::storage::monitoring
- }
- }
+ class eqiad-prod inherits role::swift::base {
+ system::role { 'role::swift::eqiad-prod':
+ description => 'Swift eqiad production cluster',
+ }
+ include passwords::swift::eqiad_prod
+ class { '::swift::base':
+ hash_path_suffix => '4f93c548a5903a13',
+ cluster_name => 'eqiad-prod',
+ }
+ class ganglia_reporter inherits role::swift::eqiad-prod {
+ # one host per cluster should report global stats
+ file { '/usr/local/bin/swift-ganglia-report-global-stats':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source =>
'puppet:///files/swift/swift-ganglia-report-global-stats',
+ }
+ # config file to hold the password
+ $password = $passwords::swift::eqiad_prod::rewrite_password
+ file { '/etc/swift-ganglia-report-global-stats.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0440',
+ content =>
template('swift/swift-ganglia-report-global-stats.conf.erb'),
+ }
+ cron { 'swift-ganglia-report-global-stats':
+ ensure => present,
+ command => "/usr/local/bin/swift-ganglia-report-global-stats
-C /etc/swift-ganglia-report-global-stats.conf -u 'mw:media' -c eqiad-prod",
+ user => 'root',
+ }
+ }
+ class proxy inherits role::swift::eqiad-prod {
+ class { '::swift::proxy':
+ statsd_host => 'statsd.eqiad.wmnet',
+ statsd_metric_prefix => "swift.eqiad-prod.${::hostname}",
+ statsd_default_sample_rate => '0.1',
+ bind_port => '80',
+ proxy_address => 'http://ms-fe.eqiad.wmnet',
+ num_workers => $::processorcount,
+ memcached_servers => [ 'ms-fe1001.eqiad.wmnet:11211',
+ 'ms-fe1002.eqiad.wmnet:11211',
+ 'ms-fe1003.eqiad.wmnet:11211',
+ 'ms-fe1004.eqiad.wmnet:11211'
],
+ auth_backend => 'tempauth',
+ super_admin_key =>
$passwords::swift::eqiad_prod::super_admin_key,
+ rewrite_account => 'AUTH_mw',
+ rewrite_password =>
$passwords::swift::eqiad_prod::rewrite_password,
+ rewrite_thumb_server => 'rendering.svc.eqiad.wmnet',
+ shard_container_list =>
'wikipedia-commons-local-thumb,wikipedia-de-local-thumb,wikipedia-en-local-thumb,wikipedia-fi-local-thumb,wikipedia-fr-local-thumb,wikipedia-he-local-thumb,wikipedia-hu-local-thumb,wikipedia-id-local-thumb,wikipedia-it-local-thumb,wikipedia-ja-local-thumb,wikipedia-ro-local-thumb,wikipedia-ru-local-thumb,wikipedia-th-local-thumb,wikipedia-tr-local-thumb,wikipedia-uk-local-thumb,wikipedia-zh-local-thumb,wikipedia-commons-local-public,wikipedia-de-local-public,wikipedia-en-local-public,wikipedia-fi-local-public,wikipedia-fr-local-public,wikipedia-he-local-public,wikipedia-hu-local-public,wikipedia-id-local-public,wikipedia-it-local-public,wikipedia-ja-local-public,wikipedia-ro-local-public,wikipedia-ru-local-public,wikipedia-th-local-public,wikipedia-tr-local-public,wikipedia-uk-local-public,wikipedia-zh-local-public,wikipedia-commons-local-temp,wikipedia-de-local-temp,wikipedia-en-local-temp,wikipedia-fi-local-temp,wikipedia-fr-local-temp,wikipedia-he-local-temp,wikipedia-hu-local-temp,wikipedia-id-local-temp,wikipedia-it-local-temp,wikipedia-ja-local-temp,wikipedia-ro-local-temp,wikipedia-ru-local-temp,wikipedia-th-local-temp,wikipedia-tr-local-temp,wikipedia-uk-local-temp,wikipedia-zh-local-temp,wikipedia-commons-local-transcoded,wikipedia-de-local-transcoded,wikipedia-en-local-transcoded,wikipedia-fi-local-transcoded,wikipedia-fr-local-transcoded,wikipedia-he-local-transcoded,wikipedia-hu-local-transcoded,wikipedia-id-local-transcoded,wikipedia-it-local-transcoded,wikipedia-ja-local-transcoded,wikipedia-ro-local-transcoded,wikipedia-ru-local-transcoded,wikipedia-th-local-transcoded,wikipedia-tr-local-transcoded,wikipedia-uk-local-transcoded,wikipedia-zh-local-transcoded,global-data-math-render',
+ backend_url_format => 'sitelang',
+ }
+ class { '::swift::proxy::monitoring':
+ host => 'ms-fe.eqiad.wmnet',
+ }
+ }
+ class storage inherits role::swift::eqiad-prod {
+ include ::swift::storage
+ include ::swift::storage::monitoring
+ }
+ }
+ class esams-prod inherits role::swift::base {
+ system::role { 'role::swift::esams-prod':
+ description => 'Swift esams production cluster',
+ }
+ include passwords::swift::esams_prod
+ class { '::swift::base':
+ hash_path_suffix => 'a0af6563d361f968',
+ cluster_name => 'esams-prod',
+ }
+ class ganglia_reporter inherits role::swift::esams-prod {
+ # one host per cluster should report global stats
+ file { '/usr/local/bin/swift-ganglia-report-global-stats':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source =>
'puppet:///files/swift/swift-ganglia-report-global-stats',
+ }
+ # config file to hold the password
+ $password = $passwords::swift::esams_prod::rewrite_password
+ file { '/etc/swift-ganglia-report-global-stats.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0440',
+ content =>
template('swift/swift-ganglia-report-global-stats.conf.erb'),
+ }
+ cron { 'swift-ganglia-report-global-stats':
+ ensure => present,
+ command => "/usr/local/bin/swift-ganglia-report-global-stats
-C /etc/swift-ganglia-report-global-stats.conf -u 'mw:media' -c esams-prod",
+ user => 'root',
+ }
+ }
+ class proxy inherits role::swift::esams-prod {
+ class { '::swift::proxy':
+ statsd_host => 'statsd.eqiad.wmnet',
+ statsd_metric_prefix => "swift.esams-prod.${::hostname}",
+ statsd_default_sample_rate => '0.1',
+ bind_port => '80',
+ proxy_address => 'http://ms-fe.esams.wmnet',
+ num_workers => $::processorcount,
+ memcached_servers => [ 'ms-fe3001.esams.wmnet:11211',
+ 'ms-fe3002.esams.wmnet:11211'
],
+ auth_backend => 'tempauth',
+ super_admin_key =>
$passwords::swift::esams_prod::super_admin_key,
+ rewrite_account => 'AUTH_mw',
+ rewrite_password =>
$passwords::swift::esams_prod::rewrite_password,
+ rewrite_thumb_server => 'upload.wikimedia.org',
+ shard_container_list => '',
+ backend_url_format => 'asis',
+ }
+ class { '::swift::proxy::monitoring':
+ host => 'ms-fe.esams.wmnet',
+ }
+ }
+ class storage inherits role::swift::esams-prod {
+ include ::swift::storage
+ include ::swift::storage::monitoring
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/140654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc919a3bb52254f5ae2a0a98f3ad3eceee950990
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
