Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/175714
Change subject: swift_new: reorganize hieradata ...................................................................... swift_new: reorganize hieradata Change-Id: Ibddd82db898c16666feb2c58fb4c25daa32c38a1 Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org> --- M hieradata/codfw.yaml A hieradata/codfw/swift_new.yaml A hieradata/codfw/swift_new/params.yaml A hieradata/codfw/swift_new/proxy.yaml A hieradata/codfw/swift_new/storage.yaml 5 files changed, 96 insertions(+), 98 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/175714/1 diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml index 3468965..89db560 100644 --- a/hieradata/codfw.yaml +++ b/hieradata/codfw.yaml @@ -1,101 +1,3 @@ -swift_new::params::swift_cluster: codfw-prod -swift_new::params::accounts: - super_admin: - access: '.admin .reseller_admin' - account_name: 'AUTH_admin' - auth: 'http://ms-fe.svc.codfw.wmnet' - user: 'admin:admin' - mw_media: - access: '.admin' - account_name: 'AUTH_mw' - auth: 'http://ms-fe.svc.codfw.wmnet' - user: 'mw:media' - dispersion: - access: '.admin' - account_name: 'AUTH_dispersion' - auth: 'http://ms-fe.svc.codfw.wmnet' - user: 'swift:dispersion' - search_backup: - access: '.admin' - account_name: 'AUTH_search' - auth: 'http://ms-fe.svc.codfw.wmnet' - user: 'search:backup' - -# keys are to be defined in private repo, e.g.: -#swift_new::params::account_keys: -# super_admin: <key> -# mw_media: <key> -# dispersion: <key> -# search_backup: <key> - -swift_new::hash_path_suffix: 'de4227064232ed08' -swift_new::storage::statsd_host: 'localhost' -swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet' -swift_new::proxy::statsd_host: 'localhost' -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', - - 'wikipedia-commons-local-public', 'wikipedia-commons-local-temp', - 'wikipedia-commons-local-thumb', 'wikipedia-commons-local-transcoded', - - 'wikipedia-de-local-public', 'wikipedia-de-local-temp', - 'wikipedia-de-local-thumb', 'wikipedia-de-local-transcoded', - - 'wikipedia-en-local-public', 'wikipedia-en-local-temp', - 'wikipedia-en-local-thumb', 'wikipedia-en-local-transcoded', - - 'wikipedia-fi-local-public', 'wikipedia-fi-local-temp', - 'wikipedia-fi-local-thumb', 'wikipedia-fi-local-transcoded', - - 'wikipedia-fr-local-public', 'wikipedia-fr-local-temp', - 'wikipedia-fr-local-thumb', 'wikipedia-fr-local-transcoded', - - 'wikipedia-he-local-public', 'wikipedia-he-local-temp', - 'wikipedia-he-local-thumb', 'wikipedia-he-local-transcoded', - - 'wikipedia-hu-local-public', 'wikipedia-hu-local-temp', - 'wikipedia-hu-local-thumb', 'wikipedia-hu-local-transcoded', - - 'wikipedia-id-local-public', 'wikipedia-id-local-temp', - 'wikipedia-id-local-thumb', 'wikipedia-id-local-transcoded', - - 'wikipedia-it-local-public', 'wikipedia-it-local-temp', - 'wikipedia-it-local-thumb', 'wikipedia-it-local-transcoded', - - 'wikipedia-ja-local-public', 'wikipedia-ja-local-temp', - 'wikipedia-ja-local-thumb', 'wikipedia-ja-local-transcoded', - - 'wikipedia-ro-local-public', 'wikipedia-ro-local-temp', - 'wikipedia-ro-local-thumb', 'wikipedia-ro-local-transcoded', - - 'wikipedia-ru-local-public', 'wikipedia-ru-local-temp', - 'wikipedia-ru-local-thumb', 'wikipedia-ru-local-transcoded', - - 'wikipedia-th-local-public', 'wikipedia-th-local-temp', - 'wikipedia-th-local-thumb', 'wikipedia-th-local-transcoded', - - 'wikipedia-tr-local-public', 'wikipedia-tr-local-temp', - 'wikipedia-tr-local-thumb', 'wikipedia-tr-local-transcoded', - - 'wikipedia-uk-local-public', 'wikipedia-uk-local-temp', - 'wikipedia-uk-local-thumb', 'wikipedia-uk-local-transcoded', - - 'wikipedia-zh-local-public', 'wikipedia-zh-local-temp', - 'wikipedia-zh-local-thumb', 'wikipedia-zh-local-transcoded' -# no trailing comma! -] - swift_storage_drives: [ '/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd', '/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh', diff --git a/hieradata/codfw/swift_new.yaml b/hieradata/codfw/swift_new.yaml new file mode 100644 index 0000000..72e1221 --- /dev/null +++ b/hieradata/codfw/swift_new.yaml @@ -0,0 +1 @@ +hash_path_suffix: 'de4227064232ed08' diff --git a/hieradata/codfw/swift_new/params.yaml b/hieradata/codfw/swift_new/params.yaml new file mode 100644 index 0000000..56398d0 --- /dev/null +++ b/hieradata/codfw/swift_new/params.yaml @@ -0,0 +1,29 @@ +swift_cluster: codfw-prod +accounts: + super_admin: + access: '.admin .reseller_admin' + account_name: 'AUTH_admin' + auth: 'http://ms-fe.svc.codfw.wmnet' + user: 'admin:admin' + mw_media: + access: '.admin' + account_name: 'AUTH_mw' + auth: 'http://ms-fe.svc.codfw.wmnet' + user: 'mw:media' + dispersion: + access: '.admin' + account_name: 'AUTH_dispersion' + auth: 'http://ms-fe.svc.codfw.wmnet' + user: 'swift:dispersion' + search_backup: + access: '.admin' + account_name: 'AUTH_search' + auth: 'http://ms-fe.svc.codfw.wmnet' + user: 'search:backup' +# keys are to be defined in private repo, e.g.: +#swift_new::params::account_keys: +# super_admin: <key> +# mw_media: <key> +# dispersion: <key> +# search_backup: <key> + diff --git a/hieradata/codfw/swift_new/proxy.yaml b/hieradata/codfw/swift_new/proxy.yaml new file mode 100644 index 0000000..a9ab146 --- /dev/null +++ b/hieradata/codfw/swift_new/proxy.yaml @@ -0,0 +1,65 @@ +proxy_address: 'http://ms-fe.svc.codfw.wmnet' +statsd_host: 'localhost' +backend_url_format: 'sitelang' +rewrite_thumb_server: 'rendering.svc.eqiad.wmnet' +dispersion_account: 'dispersion' +rewrite_account: 'mw_media' +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! +] +shard_container_list: [ + 'global-data-math-render', + + 'wikipedia-commons-local-public', 'wikipedia-commons-local-temp', + 'wikipedia-commons-local-thumb', 'wikipedia-commons-local-transcoded', + + 'wikipedia-de-local-public', 'wikipedia-de-local-temp', + 'wikipedia-de-local-thumb', 'wikipedia-de-local-transcoded', + + 'wikipedia-en-local-public', 'wikipedia-en-local-temp', + 'wikipedia-en-local-thumb', 'wikipedia-en-local-transcoded', + + 'wikipedia-fi-local-public', 'wikipedia-fi-local-temp', + 'wikipedia-fi-local-thumb', 'wikipedia-fi-local-transcoded', + + 'wikipedia-fr-local-public', 'wikipedia-fr-local-temp', + 'wikipedia-fr-local-thumb', 'wikipedia-fr-local-transcoded', + + 'wikipedia-he-local-public', 'wikipedia-he-local-temp', + 'wikipedia-he-local-thumb', 'wikipedia-he-local-transcoded', + + 'wikipedia-hu-local-public', 'wikipedia-hu-local-temp', + 'wikipedia-hu-local-thumb', 'wikipedia-hu-local-transcoded', + + 'wikipedia-id-local-public', 'wikipedia-id-local-temp', + 'wikipedia-id-local-thumb', 'wikipedia-id-local-transcoded', + + 'wikipedia-it-local-public', 'wikipedia-it-local-temp', + 'wikipedia-it-local-thumb', 'wikipedia-it-local-transcoded', + + 'wikipedia-ja-local-public', 'wikipedia-ja-local-temp', + 'wikipedia-ja-local-thumb', 'wikipedia-ja-local-transcoded', + + 'wikipedia-ro-local-public', 'wikipedia-ro-local-temp', + 'wikipedia-ro-local-thumb', 'wikipedia-ro-local-transcoded', + + 'wikipedia-ru-local-public', 'wikipedia-ru-local-temp', + 'wikipedia-ru-local-thumb', 'wikipedia-ru-local-transcoded', + + 'wikipedia-th-local-public', 'wikipedia-th-local-temp', + 'wikipedia-th-local-thumb', 'wikipedia-th-local-transcoded', + + 'wikipedia-tr-local-public', 'wikipedia-tr-local-temp', + 'wikipedia-tr-local-thumb', 'wikipedia-tr-local-transcoded', + + 'wikipedia-uk-local-public', 'wikipedia-uk-local-temp', + 'wikipedia-uk-local-thumb', 'wikipedia-uk-local-transcoded', + + 'wikipedia-zh-local-public', 'wikipedia-zh-local-temp', + 'wikipedia-zh-local-thumb', 'wikipedia-zh-local-transcoded' +# no trailing comma! +] diff --git a/hieradata/codfw/swift_new/storage.yaml b/hieradata/codfw/swift_new/storage.yaml new file mode 100644 index 0000000..3596100 --- /dev/null +++ b/hieradata/codfw/swift_new/storage.yaml @@ -0,0 +1 @@ +statsd_host: 'localhost' -- To view, visit https://gerrit.wikimedia.org/r/175714 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibddd82db898c16666feb2c58fb4c25daa32c38a1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
