Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148293
Change subject: swift - retab
......................................................................
swift - retab
..one of the last role classes using literal
tabs after we already converted most of them..
Change-Id: I555d777571ad1f35c1c95dfdad3860366ea0a92a
---
M manifests/role/swift.pp
1 file changed, 235 insertions(+), 235 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/148293/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index c829373..36f3313 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -2,196 +2,196 @@
@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,
- }
- # report global stats to graphite
- file { "/usr/local/bin/swift-account-stats":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
"puppet:///files/swift/swift-account-stats",
- require => [ Package['python-swiftclient'],
Package['python-statsd'] ],
- }
- file { "/etc/swift/account_mw_media.env":
- owner => 'root',
- group => 'root',
- mode => '0440',
- content => "export
ST_AUTH=http://ms-fe.eqiad.wmnet/auth/v1.0\nexport ST_USER=mw:media\nexport
ST_KEY=${password}\n"
- }
- cron { "swift-account-stats_mw_media":
- ensure => present,
- command => ". /etc/swift/account_mw_media.env
&& /usr/local/bin/swift-account-stats --prefix swift.eqiad-prod.stats
--statsd-host statsd.eqiad.wmnet 1>/dev/null",
- user => root,
- hour => "*",
- minute => "*",
- }
- # swift-dispersion reporting
- file { "/usr/local/bin/swift-dispersion-stats":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
"puppet:///files/swift/swift-dispersion-stats",
- require => [ Package['swift'],
Package['python-statsd'] ],
- }
- cron { "swift-dispersion-stats":
- ensure => present,
- command =>
"/usr/local/bin/swift-dispersion-stats --prefix swift.eqiad-prod.dispersion
--statsd-host statsd.eqiad.wmnet 1>/dev/null",
- user => root,
- hour => "*",
- minute => "*/15",
- }
- }
- class proxy inherits role::swift::eqiad-prod {
- class { "::swift::proxy":
- statsd_host => 'statsd.eqiad.wmnet',
- statsd_metric_prefix =>
"swift.eqiad-prod.${::hostname}",
- 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",
- dispersion_password =>
$passwords::swift::eqiad_prod::dispersion_password,
- }
- class { '::swift::proxy::monitoring':
- host => 'ms-fe.eqiad.wmnet',
- }
- include role::swift::icehouse
- }
- class storage inherits role::swift::eqiad-prod {
- include ::swift::storage
- include ::swift::storage::monitoring
- include role::swift::icehouse
- }
- }
- 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,
- }
- # report global stats to graphite
- file { "/usr/local/bin/swift-account-stats":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
"puppet:///files/swift/swift-account-stats",
- require => [ Package['python-swiftclient'],
Package['python-statsd'] ],
- }
- file { "/etc/swift/account_mw_media.env":
- owner => 'root',
- group => 'root',
- mode => '0440',
- content => "export
ST_AUTH=http://ms-fe.esams.wmnet/auth/v1.0\nexport ST_USER=mw:media\nexport
ST_KEY=${password}\n"
- }
- cron { "swift-account-stats_mw_media":
- ensure => present,
- command => ". /etc/swift/account_mw_media.env
&& /usr/local/bin/swift-account-stats --prefix swift.esams-prod.stats
--statsd-host statsd.eqiad.wmnet 1>/dev/null",
- user => root,
- hour => "*",
- minute => "*",
- }
- # swift-dispersion reporting
- file { "/usr/local/bin/swift-dispersion-stats":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
"puppet:///files/swift/swift-dispersion-stats",
- require => [ Package['swift'],
Package['python-statsd'] ],
- }
- cron { "swift-dispersion-stats":
- ensure => present,
- command =>
"/usr/local/bin/swift-dispersion-stats --prefix swift.esams-prod.dispersion
--statsd-host statsd.eqiad.wmnet 1>/dev/null",
- user => root,
- hour => "*",
- minute => "*/15",
- }
- }
- class proxy inherits role::swift::esams-prod {
- class { "::swift::proxy":
- statsd_host => 'statsd.eqiad.wmnet',
- statsd_metric_prefix =>
"swift.esams-prod.${::hostname}",
- 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",
- dispersion_password =>
$passwords::swift::esams_prod::dispersion_password,
- }
- class { '::swift::proxy::monitoring':
- host => 'ms-fe.esams.wmnet',
- }
- include role::swift::icehouse
- }
- class storage inherits role::swift::esams-prod {
- include ::swift::storage
- include ::swift::storage::monitoring
- include role::swift::icehouse
- }
- }
+ 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,
+ }
+ # report global stats to graphite
+ file { "/usr/local/bin/swift-account-stats":
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => "puppet:///files/swift/swift-account-stats",
+ require => [ Package['python-swiftclient'],
Package['python-statsd'] ],
+ }
+ file { "/etc/swift/account_mw_media.env":
+ owner => 'root',
+ group => 'root',
+ mode => '0440',
+ content => "export
ST_AUTH=http://ms-fe.eqiad.wmnet/auth/v1.0\nexport ST_USER=mw:media\nexport
ST_KEY=${password}\n"
+ }
+ cron { "swift-account-stats_mw_media":
+ ensure => present,
+ command => ". /etc/swift/account_mw_media.env &&
/usr/local/bin/swift-account-stats --prefix swift.eqiad-prod.stats
--statsd-host statsd.eqiad.wmnet 1>/dev/null",
+ user => root,
+ hour => "*",
+ minute => "*",
+ }
+ # swift-dispersion reporting
+ file { "/usr/local/bin/swift-dispersion-stats":
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => "puppet:///files/swift/swift-dispersion-stats",
+ require => [ Package['swift'], Package['python-statsd'] ],
+ }
+ cron { "swift-dispersion-stats":
+ ensure => present,
+ command => "/usr/local/bin/swift-dispersion-stats --prefix
swift.eqiad-prod.dispersion --statsd-host statsd.eqiad.wmnet 1>/dev/null",
+ user => root,
+ hour => "*",
+ minute => "*/15",
+ }
+ }
+ class proxy inherits role::swift::eqiad-prod {
+ class { "::swift::proxy":
+ statsd_host => 'statsd.eqiad.wmnet',
+ statsd_metric_prefix => "swift.eqiad-prod.${::hostname}",
+ 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",
+ dispersion_password =>
$passwords::swift::eqiad_prod::dispersion_password,
+ }
+ class { '::swift::proxy::monitoring':
+ host => 'ms-fe.eqiad.wmnet',
+ }
+ include role::swift::icehouse
+ }
+ class storage inherits role::swift::eqiad-prod {
+ include ::swift::storage
+ include ::swift::storage::monitoring
+ include role::swift::icehouse
+ }
+ }
+ 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,
+ }
+ # report global stats to graphite
+ file { "/usr/local/bin/swift-account-stats":
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => "puppet:///files/swift/swift-account-stats",
+ require => [ Package['python-swiftclient'],
Package['python-statsd'] ],
+ }
+ file { "/etc/swift/account_mw_media.env":
+ owner => 'root',
+ group => 'root',
+ mode => '0440',
+ content => "export
ST_AUTH=http://ms-fe.esams.wmnet/auth/v1.0\nexport ST_USER=mw:media\nexport
ST_KEY=${password}\n"
+ }
+ cron { "swift-account-stats_mw_media":
+ ensure => present,
+ command => ". /etc/swift/account_mw_media.env &&
/usr/local/bin/swift-account-stats --prefix swift.esams-prod.stats
--statsd-host statsd.eqiad.wmnet 1>/dev/null",
+ user => root,
+ hour => "*",
+ minute => "*",
+ }
+ # swift-dispersion reporting
+ file { "/usr/local/bin/swift-dispersion-stats":
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => "puppet:///files/swift/swift-dispersion-stats",
+ require => [ Package['swift'], Package['python-statsd'] ],
+ }
+ cron { "swift-dispersion-stats":
+ ensure => present,
+ command => "/usr/local/bin/swift-dispersion-stats --prefix
swift.esams-prod.dispersion --statsd-host statsd.eqiad.wmnet 1>/dev/null",
+ user => root,
+ hour => "*",
+ minute => "*/15",
+ }
+ }
+ class proxy inherits role::swift::esams-prod {
+ class { "::swift::proxy":
+ statsd_host => 'statsd.eqiad.wmnet',
+ statsd_metric_prefix => "swift.esams-prod.${::hostname}",
+ 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",
+ dispersion_password =>
$passwords::swift::esams_prod::dispersion_password,
+ }
+ class { '::swift::proxy::monitoring':
+ host => 'ms-fe.esams.wmnet',
+ }
+ include role::swift::icehouse
+ }
+ class storage inherits role::swift::esams-prod {
+ include ::swift::storage
+ include ::swift::storage::monitoring
+ include role::swift::icehouse
+ }
+ }
}
@@ -228,57 +228,57 @@
# $ # download:
# $ swift -A http://$PROXY_LOCAL_NET_IP:80/auth/v1.0 -U admin:admin -K
<password from labs private> download <containername>
class role::swift::labs inherits role::swift::base {
- if $::swift_proxy_hostname == undef {
- fail('$swift_proxy_hostname must be set to the FQDN of your
proxy host.')
- }
+ if $::swift_proxy_hostname == undef {
+ fail('$swift_proxy_hostname must be set to the FQDN of your proxy
host.')
+ }
- system::role { "role::swift::labs": description => "Swift labs test
production" }
- include passwords::swift::eqiad_prod
- class { "::swift::base": hash_path_suffix => "d2e8dd1aecea6e71",
cluster_name => "labs_swift" }
- class proxy inherits role::swift::labs {
- class { "::swift::proxy":
- bind_port => "80",
- proxy_address => "http://${swift_proxy_hostname}";,
- num_workers => $::processorcount,
- memcached_servers => [ "${swift_proxy_hostname}: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",
- dispersion_password =>
$passwords::swift::eqiad_prod::dispersion_password,
- }
- class { '::swift::proxy::monitoring':
- host => $swift_proxy_hostname,
- }
- }
- class storage inherits role::swift::labs {
- include ::swift::storage
- include ::swift::storage::monitoring
- }
- file { "/usr/local/bin/swift-labs-ring":
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => "puppet:///files/swift/swift-labs-ring",
- }
+ system::role { "role::swift::labs": description => "Swift labs test
production" }
+ include passwords::swift::eqiad_prod
+ class { "::swift::base": hash_path_suffix => "d2e8dd1aecea6e71",
cluster_name => "labs_swift" }
+ class proxy inherits role::swift::labs {
+ class { "::swift::proxy":
+ bind_port => "80",
+ proxy_address => "http://${swift_proxy_hostname}";,
+ num_workers => $::processorcount,
+ memcached_servers => [ "${swift_proxy_hostname}: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",
+ dispersion_password =>
$passwords::swift::eqiad_prod::dispersion_password,
+ }
+ class { '::swift::proxy::monitoring':
+ host => $swift_proxy_hostname,
+ }
+ }
+ class storage inherits role::swift::labs {
+ include ::swift::storage
+ include ::swift::storage::monitoring
+ }
+ file { "/usr/local/bin/swift-labs-ring":
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => "puppet:///files/swift/swift-labs-ring",
+ }
}
# temporary class to be applied to hosts to allow for rolling upgrades, will
# need a manual apt-get install swift
class role::swift::icehouse {
- apt::repository { 'ubuntucloud-icehouse':
- uri =>
'http://ubuntu-cloud.archive.canonical.com/ubuntu',
- dist => 'precise-updates/icehouse',
- components => 'main',
- keyfile => 'puppet:///files/misc/ubuntu-cloud.key',
- }
+ apt::repository { 'ubuntucloud-icehouse':
+ uri => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
+ dist => 'precise-updates/icehouse',
+ components => 'main',
+ keyfile => 'puppet:///files/misc/ubuntu-cloud.key',
+ }
- apt::pin { 'swift-icehouse.pref':
- package => '*',
- pin => 'release n=precise-updates/icehouse',
- priority => 1005,
- }
+ apt::pin { 'swift-icehouse.pref':
+ package => '*',
+ pin => 'release n=precise-updates/icehouse',
+ priority => 1005,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/148293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I555d777571ad1f35c1c95dfdad3860366ea0a92a
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
