Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/164528
Change subject: swift: use fully-qualified vars ...................................................................... swift: use fully-qualified vars also add more memcache servers to codfw Change-Id: If629e52db6aed7beda2b4afc3f14898d18704911 --- M hieradata/codfw.yaml M modules/swift_new/manifests/stats/accounts.pp M modules/swift_new/manifests/stats/dispersion.pp 3 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/164528/1 diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml index 0dae043..ab23e31 100644 --- a/hieradata/codfw.yaml +++ b/hieradata/codfw.yaml @@ -30,12 +30,18 @@ swift_new::hash_path_suffix: 'de4227064232ed08' swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet' -swift_new::proxy::memcached_servers: ['ms-fe2001.eqiad.wmnet:11211'] swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet' swift_new::proxy::backend_url_format: 'sitelang' swift_new::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet' swift_new::proxy::dispersion_account: 'dispersion' swift_new::proxy::rewrite_account: 'mw_media' +swift_new::proxy::memcached_servers: [ + 'ms-fe2001.codfw.wmnet:11211', + 'ms-fe2002.codfw.wmnet:11211', + 'ms-fe2003.codfw.wmnet:11211', + 'ms-fe2004.codfw.wmnet:11211' +# no trailing comma! +] swift_new::proxy::shard_container_list: [ 'global-data-math-render', diff --git a/modules/swift_new/manifests/stats/accounts.pp b/modules/swift_new/manifests/stats/accounts.pp index 1a13d5f..e2ba2bb 100644 --- a/modules/swift_new/manifests/stats/accounts.pp +++ b/modules/swift_new/manifests/stats/accounts.pp @@ -1,9 +1,9 @@ class swift_new::stats::accounts( - $swift_cluster = $swift_new::params::swift_cluster, - $accounts = $swift_new::params::accounts, - $credentials = $swift_new::params::account_keys, + $swift_cluster = $::swift_new::params::swift_cluster, + $accounts = $::swift_new::params::accounts, + $credentials = $::swift_new::params::account_keys, $statsd_host = 'statsd.eqiad.wmnet', - $statsd_prefix = "swift.${swift_cluster}.stats", + $statsd_prefix = "swift.${::swift_new::params::swift_cluster}.stats", ) { $required_packages = [ Package['python-swiftclient'], diff --git a/modules/swift_new/manifests/stats/dispersion.pp b/modules/swift_new/manifests/stats/dispersion.pp index a0938a1..c7a5cc7 100644 --- a/modules/swift_new/manifests/stats/dispersion.pp +++ b/modules/swift_new/manifests/stats/dispersion.pp @@ -1,7 +1,7 @@ class swift_new::stats::dispersion( $swift_cluster = $::swift_new::params::swift_cluster, $statsd_host = 'statsd.eqiad.wmnet', - $statsd_prefix = "swift.${swift_cluster}.dispersion", + $statsd_prefix = "swift.${::swift_new::params::swift_cluster}.dispersion", ) { $required_packages = [ Package['python-swiftclient'], -- To view, visit https://gerrit.wikimedia.org/r/164528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If629e52db6aed7beda2b4afc3f14898d18704911 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
