Filippo Giunchedi has submitted this change and it was merged.
Change subject: Rename swift_new to swift
......................................................................
Rename swift_new to swift
can be reproduced with:
git mv modules/swift{_new,}
git mv hieradata/common/swift{_new,}
git mv hieradata/eqiad/swift{_new,}
git mv hieradata/eqiad/swift{_new,}.yaml
git mv hieradata/codfw/swift{_new,}
git mv hieradata/codfw/swift{_new,}.yaml
git mv hieradata/esams/swift{_new,}
git mv hieradata/esams/swift{_new,}.yaml
git grep -l swift_new | xargs sed -i 's/swift_new/swift/g'
Change-Id: I22102da8b14a31719927355ff3efbe19717fcfae
---
R hieradata/codfw/swift.yaml
R hieradata/codfw/swift/params.yaml
R hieradata/codfw/swift/proxy.yaml
R hieradata/common/swift/params.yaml
R hieradata/common/swift/proxy.yaml
R hieradata/common/swift/storage.yaml
R hieradata/eqiad/swift.yaml
R hieradata/eqiad/swift/params.yaml
R hieradata/eqiad/swift/proxy.yaml
R hieradata/esams/swift.yaml
R hieradata/esams/swift/params.yaml
R hieradata/esams/swift/proxy.yaml
M manifests/role/graphite.pp
M manifests/role/swift.pp
R modules/swift/files/.pep8
R modules/swift/files/SwiftMedia/README
R modules/swift/files/SwiftMedia/wmf/.pep8
R modules/swift/files/SwiftMedia/wmf/__init__.py
R modules/swift/files/SwiftMedia/wmf/cors.py
R modules/swift/files/SwiftMedia/wmf/rewrite.py
R modules/swift/files/SwiftMedia/wmf/rewrite_integration_test.py
R modules/swift/files/swift-account-stats
R modules/swift/files/swift-dispersion-stats
R modules/swift/files/swift-drive-audit
R modules/swift/files/swift-drive-audit.conf
R modules/swift/files/swift-labs-ring
R modules/swift/files/swift-proxy.logrotate.conf
R modules/swift/files/swift-proxy.rsyslog.conf
A modules/swift/manifests/container_sync.pp
R modules/swift/manifests/init.pp
R modules/swift/manifests/init_device.pp
R modules/swift/manifests/label_filesystem.pp
R modules/swift/manifests/monitoring/graphite.pp
R modules/swift/manifests/mount_filesystem.pp
R modules/swift/manifests/params.pp
R modules/swift/manifests/proxy.pp
R modules/swift/manifests/ring.pp
R modules/swift/manifests/stats/accounts.pp
R modules/swift/manifests/stats/dispersion.pp
R modules/swift/manifests/stats/stats_account.pp
R modules/swift/manifests/storage.pp
R modules/swift/manifests/storage/monitor_swift_daemon.pp
R modules/swift/manifests/storage/monitoring.pp
R modules/swift/templates/account-server.conf.erb
R modules/swift/templates/container-server.conf.erb
R modules/swift/templates/container-sync-realms.conf.erb
R modules/swift/templates/dispersion.conf.erb
R modules/swift/templates/object-server.conf.erb
R modules/swift/templates/proxy-server.conf.erb
R modules/swift/templates/swift.conf.erb
D modules/swift_new/manifests/container_sync.pp
51 files changed, 79 insertions(+), 79 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw/swift_new.yaml b/hieradata/codfw/swift.yaml
similarity index 100%
rename from hieradata/codfw/swift_new.yaml
rename to hieradata/codfw/swift.yaml
diff --git a/hieradata/codfw/swift_new/params.yaml
b/hieradata/codfw/swift/params.yaml
similarity index 96%
rename from hieradata/codfw/swift_new/params.yaml
rename to hieradata/codfw/swift/params.yaml
index 56398d0..effb9eb 100644
--- a/hieradata/codfw/swift_new/params.yaml
+++ b/hieradata/codfw/swift/params.yaml
@@ -21,7 +21,7 @@
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:
+#swift::params::account_keys:
# super_admin: <key>
# mw_media: <key>
# dispersion: <key>
diff --git a/hieradata/codfw/swift_new/proxy.yaml
b/hieradata/codfw/swift/proxy.yaml
similarity index 100%
rename from hieradata/codfw/swift_new/proxy.yaml
rename to hieradata/codfw/swift/proxy.yaml
diff --git a/hieradata/common/swift_new/params.yaml
b/hieradata/common/swift/params.yaml
similarity index 90%
rename from hieradata/common/swift_new/params.yaml
rename to hieradata/common/swift/params.yaml
index ae0b39c..94ad6cd 100644
--- a/hieradata/common/swift_new/params.yaml
+++ b/hieradata/common/swift/params.yaml
@@ -7,7 +7,7 @@
cluster_codfw: 'http://ms-fe.svc.codfw.wmnet/v1/'
# the private part looks like this:
-# swift_new::params::replication_keys:
+# swift::params::replication_keys:
# mw_media:
# key: 'foo'
# key2: 'bar'
diff --git a/hieradata/common/swift_new/proxy.yaml
b/hieradata/common/swift/proxy.yaml
similarity index 100%
rename from hieradata/common/swift_new/proxy.yaml
rename to hieradata/common/swift/proxy.yaml
diff --git a/hieradata/common/swift_new/storage.yaml
b/hieradata/common/swift/storage.yaml
similarity index 100%
rename from hieradata/common/swift_new/storage.yaml
rename to hieradata/common/swift/storage.yaml
diff --git a/hieradata/eqiad/swift_new.yaml b/hieradata/eqiad/swift.yaml
similarity index 100%
rename from hieradata/eqiad/swift_new.yaml
rename to hieradata/eqiad/swift.yaml
diff --git a/hieradata/eqiad/swift_new/params.yaml
b/hieradata/eqiad/swift/params.yaml
similarity index 96%
rename from hieradata/eqiad/swift_new/params.yaml
rename to hieradata/eqiad/swift/params.yaml
index 5239667..c168762 100644
--- a/hieradata/eqiad/swift_new/params.yaml
+++ b/hieradata/eqiad/swift/params.yaml
@@ -21,7 +21,7 @@
auth: 'http://ms-fe.svc.eqiad.wmnet'
user: 'search:backup'
# keys are to be defined in private repo, e.g.:
-#swift_new::params::account_keys:
+#swift::params::account_keys:
# super_admin: <key>
# mw_media: <key>
# dispersion: <key>
diff --git a/hieradata/eqiad/swift_new/proxy.yaml
b/hieradata/eqiad/swift/proxy.yaml
similarity index 100%
rename from hieradata/eqiad/swift_new/proxy.yaml
rename to hieradata/eqiad/swift/proxy.yaml
diff --git a/hieradata/esams/swift_new.yaml b/hieradata/esams/swift.yaml
similarity index 100%
rename from hieradata/esams/swift_new.yaml
rename to hieradata/esams/swift.yaml
diff --git a/hieradata/esams/swift_new/params.yaml
b/hieradata/esams/swift/params.yaml
similarity index 95%
rename from hieradata/esams/swift_new/params.yaml
rename to hieradata/esams/swift/params.yaml
index 225db86..0c643ca 100644
--- a/hieradata/esams/swift_new/params.yaml
+++ b/hieradata/esams/swift/params.yaml
@@ -16,7 +16,7 @@
auth: 'http://ms-fe.svc.esams.wmnet'
user: 'swift:dispersion'
# keys are to be defined in private repo, e.g.:
-#swift_new::params::account_keys:
+#swift::params::account_keys:
# super_admin: <key>
# mw_media: <key>
# dispersion: <key>
diff --git a/hieradata/esams/swift_new/proxy.yaml
b/hieradata/esams/swift/proxy.yaml
similarity index 100%
rename from hieradata/esams/swift_new/proxy.yaml
rename to hieradata/esams/swift/proxy.yaml
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 709e3da..d460aec 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -239,7 +239,7 @@
class role::graphite::production::alerts {
include ::mediawiki::monitoring::graphite
include ::eventlogging::monitoring::graphite
- include ::swift_new::monitoring::graphite
+ include ::swift::monitoring::graphite
include ::graphite::monitoring::graphite
# Monitor production 5xx rates
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index d4b3fa1..5c3930f 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -9,9 +9,9 @@
}
include standard
- include ::swift_new::params
- include ::swift_new::stats::dispersion
- include ::swift_new::stats::accounts
+ include ::swift::params
+ include ::swift::stats::dispersion
+ include ::swift::stats::accounts
}
class role::swift::proxy {
@@ -20,13 +20,13 @@
}
include standard
- include ::swift_new::params
- include ::swift_new
- include ::swift_new::ring
- include ::swift_new::container_sync
+ include ::swift::params
+ include ::swift
+ include ::swift::ring
+ include ::swift::container_sync
- class { '::swift_new::proxy':
- statsd_metric_prefix =>
"swift.${::swift_new::params::swift_cluster}.${::hostname}",
+ class { '::swift::proxy':
+ statsd_metric_prefix =>
"swift.${::swift::params::swift_cluster}.${::hostname}",
}
class { '::memcached':
@@ -38,11 +38,11 @@
monitoring::service { 'swift-http-frontend':
description => 'Swift HTTP frontend',
- check_command =>
"check_http_url!${::swift_new::proxy::proxy_service_host}!/monitoring/frontend",
+ check_command =>
"check_http_url!${::swift::proxy::proxy_service_host}!/monitoring/frontend",
}
monitoring::service { 'swift-http-backend':
description => 'Swift HTTP backend',
- check_command =>
"check_http_url!${::swift_new::proxy::proxy_service_host}!/monitoring/backend",
+ check_command =>
"check_http_url!${::swift::proxy::proxy_service_host}!/monitoring/backend",
}
}
@@ -53,25 +53,25 @@
}
include standard
- include ::swift_new::params
- include ::swift_new
- include ::swift_new::ring
- class { '::swift_new::storage':
- statsd_metric_prefix =>
"swift.${::swift_new::params::swift_cluster}.${::hostname}",
+ include ::swift::params
+ include ::swift
+ include ::swift::ring
+ class { '::swift::storage':
+ statsd_metric_prefix =>
"swift.${::swift::params::swift_cluster}.${::hostname}",
}
- include ::swift_new::container_sync
- include ::swift_new::storage::monitoring
+ include ::swift::container_sync
+ include ::swift::storage::monitoring
include role::statsite
$all_drives = hiera('swift_storage_drives')
- swift_new::init_device { $all_drives:
+ swift::init_device { $all_drives:
partition_nr => '1',
}
# these are already partitioned and xfs formatted by the installer
$aux_partitions = hiera('swift_aux_partitions')
- swift_new::label_filesystem { $aux_partitions: }
- swift_new::mount_filesystem { $aux_partitions: }
+ swift::label_filesystem { $aux_partitions: }
+ swift::mount_filesystem { $aux_partitions: }
}
diff --git a/modules/swift_new/files/.pep8 b/modules/swift/files/.pep8
similarity index 100%
rename from modules/swift_new/files/.pep8
rename to modules/swift/files/.pep8
diff --git a/modules/swift_new/files/SwiftMedia/README
b/modules/swift/files/SwiftMedia/README
similarity index 100%
rename from modules/swift_new/files/SwiftMedia/README
rename to modules/swift/files/SwiftMedia/README
diff --git a/modules/swift_new/files/SwiftMedia/wmf/.pep8
b/modules/swift/files/SwiftMedia/wmf/.pep8
similarity index 100%
rename from modules/swift_new/files/SwiftMedia/wmf/.pep8
rename to modules/swift/files/SwiftMedia/wmf/.pep8
diff --git a/modules/swift_new/files/SwiftMedia/wmf/__init__.py
b/modules/swift/files/SwiftMedia/wmf/__init__.py
similarity index 100%
rename from modules/swift_new/files/SwiftMedia/wmf/__init__.py
rename to modules/swift/files/SwiftMedia/wmf/__init__.py
diff --git a/modules/swift_new/files/SwiftMedia/wmf/cors.py
b/modules/swift/files/SwiftMedia/wmf/cors.py
similarity index 100%
rename from modules/swift_new/files/SwiftMedia/wmf/cors.py
rename to modules/swift/files/SwiftMedia/wmf/cors.py
diff --git a/modules/swift_new/files/SwiftMedia/wmf/rewrite.py
b/modules/swift/files/SwiftMedia/wmf/rewrite.py
similarity index 100%
rename from modules/swift_new/files/SwiftMedia/wmf/rewrite.py
rename to modules/swift/files/SwiftMedia/wmf/rewrite.py
diff --git a/modules/swift_new/files/SwiftMedia/wmf/rewrite_integration_test.py
b/modules/swift/files/SwiftMedia/wmf/rewrite_integration_test.py
similarity index 100%
rename from modules/swift_new/files/SwiftMedia/wmf/rewrite_integration_test.py
rename to modules/swift/files/SwiftMedia/wmf/rewrite_integration_test.py
diff --git a/modules/swift_new/files/swift-account-stats
b/modules/swift/files/swift-account-stats
similarity index 100%
rename from modules/swift_new/files/swift-account-stats
rename to modules/swift/files/swift-account-stats
diff --git a/modules/swift_new/files/swift-dispersion-stats
b/modules/swift/files/swift-dispersion-stats
similarity index 100%
rename from modules/swift_new/files/swift-dispersion-stats
rename to modules/swift/files/swift-dispersion-stats
diff --git a/modules/swift_new/files/swift-drive-audit
b/modules/swift/files/swift-drive-audit
similarity index 100%
rename from modules/swift_new/files/swift-drive-audit
rename to modules/swift/files/swift-drive-audit
diff --git a/modules/swift_new/files/swift-drive-audit.conf
b/modules/swift/files/swift-drive-audit.conf
similarity index 100%
rename from modules/swift_new/files/swift-drive-audit.conf
rename to modules/swift/files/swift-drive-audit.conf
diff --git a/modules/swift_new/files/swift-labs-ring
b/modules/swift/files/swift-labs-ring
similarity index 100%
rename from modules/swift_new/files/swift-labs-ring
rename to modules/swift/files/swift-labs-ring
diff --git a/modules/swift_new/files/swift-proxy.logrotate.conf
b/modules/swift/files/swift-proxy.logrotate.conf
similarity index 100%
rename from modules/swift_new/files/swift-proxy.logrotate.conf
rename to modules/swift/files/swift-proxy.logrotate.conf
diff --git a/modules/swift_new/files/swift-proxy.rsyslog.conf
b/modules/swift/files/swift-proxy.rsyslog.conf
similarity index 100%
rename from modules/swift_new/files/swift-proxy.rsyslog.conf
rename to modules/swift/files/swift-proxy.rsyslog.conf
diff --git a/modules/swift/manifests/container_sync.pp
b/modules/swift/manifests/container_sync.pp
new file mode 100644
index 0000000..404850a
--- /dev/null
+++ b/modules/swift/manifests/container_sync.pp
@@ -0,0 +1,12 @@
+class swift::container_sync (
+ $replication_accounts = $::swift::params::replication_accounts,
+ $replication_keys = $::swift::params::replication_keys,
+) {
+ file { '/etc/swift/container-sync-realms.conf':
+ ensure => present,
+ mode => '0440',
+ owner => 'swift',
+ group => 'swift',
+ content => template('swift/container-sync-realms.conf.erb'),
+ }
+}
diff --git a/modules/swift_new/manifests/init.pp
b/modules/swift/manifests/init.pp
similarity index 94%
rename from modules/swift_new/manifests/init.pp
rename to modules/swift/manifests/init.pp
index 83f4a1f..d34ace2 100644
--- a/modules/swift_new/manifests/init.pp
+++ b/modules/swift/manifests/init.pp
@@ -1,7 +1,7 @@
# XXX support additional storage policies
-class swift_new (
+class swift (
$hash_path_suffix,
- $swift_cluster = $swift_new::params::swift_cluster,
+ $swift_cluster = $swift::params::swift_cluster,
) {
# Recommendations from Swift -- see <http://tinyurl.com/swift-sysctl>.
sysctl::parameters { 'swift_performance':
@@ -77,7 +77,7 @@
file { '/etc/swift/swift.conf':
ensure => present,
require => Package['swift'],
- content => template('swift_new/swift.conf.erb'),
+ content => template('swift/swift.conf.erb'),
}
file { '/var/cache/swift':
diff --git a/modules/swift_new/manifests/init_device.pp
b/modules/swift/manifests/init_device.pp
similarity index 90%
rename from modules/swift_new/manifests/init_device.pp
rename to modules/swift/manifests/init_device.pp
index a7001ce..7e096d7 100644
--- a/modules/swift_new/manifests/init_device.pp
+++ b/modules/swift/manifests/init_device.pp
@@ -1,4 +1,4 @@
-define swift_new::init_device($partition_nr='1') {
+define swift::init_device($partition_nr='1') {
if (! $title =~ /^\/dev\/([hvs]d[a-z]+|md[0-9]+)$/) {
fail("unable to init ${title} for swift")
}
@@ -23,7 +23,7 @@
unless => "xfs_admin -l ${dev}",
}
- swift_new::mount_filesystem { $dev:
+ swift::mount_filesystem { $dev:
require => Exec["mkfs-${dev}"],
}
}
diff --git a/modules/swift_new/manifests/label_filesystem.pp
b/modules/swift/manifests/label_filesystem.pp
similarity index 90%
rename from modules/swift_new/manifests/label_filesystem.pp
rename to modules/swift/manifests/label_filesystem.pp
index c9d2159..5f65013 100644
--- a/modules/swift_new/manifests/label_filesystem.pp
+++ b/modules/swift/manifests/label_filesystem.pp
@@ -1,4 +1,4 @@
-define swift_new::label_filesystem {
+define swift::label_filesystem {
$dev = $title
$dev_suffix = regsubst($dev, '^\/dev\/(.*)$', '\1')
$fs_label = "swift-${dev_suffix}"
diff --git a/modules/swift_new/manifests/monitoring/graphite.pp
b/modules/swift/manifests/monitoring/graphite.pp
similarity index 89%
rename from modules/swift_new/manifests/monitoring/graphite.pp
rename to modules/swift/manifests/monitoring/graphite.pp
index da6a15c..e05fdcb 100644
--- a/modules/swift_new/manifests/monitoring/graphite.pp
+++ b/modules/swift/manifests/monitoring/graphite.pp
@@ -1,5 +1,5 @@
-class swift_new::monitoring::graphite (
- $swift_cluster = $::swift_new::params::swift_cluster,
+class swift::monitoring::graphite (
+ $swift_cluster = $::swift::params::swift_cluster,
) {
monitoring::graphite_threshold {
"swift_${swift_cluster}_dispersion_object":
description => "swift ${swift_cluster} object availability",
diff --git a/modules/swift_new/manifests/mount_filesystem.pp
b/modules/swift/manifests/mount_filesystem.pp
similarity index 95%
rename from modules/swift_new/manifests/mount_filesystem.pp
rename to modules/swift/manifests/mount_filesystem.pp
index c169e35..05fb2f8 100644
--- a/modules/swift_new/manifests/mount_filesystem.pp
+++ b/modules/swift/manifests/mount_filesystem.pp
@@ -1,4 +1,4 @@
-define swift_new::mount_filesystem (
+define swift::mount_filesystem (
$mount_base = '/srv/swift-storage',
){
$dev = $title
diff --git a/modules/swift_new/manifests/params.pp
b/modules/swift/manifests/params.pp
similarity index 90%
rename from modules/swift_new/manifests/params.pp
rename to modules/swift/manifests/params.pp
index e8f1ef5..4cc3bff 100644
--- a/modules/swift_new/manifests/params.pp
+++ b/modules/swift/manifests/params.pp
@@ -1,4 +1,4 @@
-class swift_new::params (
+class swift::params (
$swift_cluster = undef,
$accounts = {},
$account_keys = {},
diff --git a/modules/swift_new/manifests/proxy.pp
b/modules/swift/manifests/proxy.pp
similarity index 73%
rename from modules/swift_new/manifests/proxy.pp
rename to modules/swift/manifests/proxy.pp
index ab4b034..6d02641 100644
--- a/modules/swift_new/manifests/proxy.pp
+++ b/modules/swift/manifests/proxy.pp
@@ -1,9 +1,9 @@
-class swift_new::proxy (
+class swift::proxy (
$proxy_service_host,
$rewrite_thumb_server,
$shard_container_list,
- $accounts = $swift_new::params::accounts,
- $credentials = $swift_new::params::account_keys,
+ $accounts = $swift::params::accounts,
+ $credentials = $swift::params::account_keys,
$memcached_servers = ['localhost:11211'],
$statsd_host = undef,
$statsd_metric_prefix = undef,
@@ -25,7 +25,7 @@
owner => 'swift',
group => 'swift',
mode => '0440',
- content => template('swift_new/proxy-server.conf.erb'),
+ content => template('swift/proxy-server.conf.erb'),
require => Package['swift-proxy'],
}
@@ -34,19 +34,19 @@
owner => 'swift',
group => 'swift',
mode => '0440',
- content => template('swift_new/dispersion.conf.erb'),
+ content => template('swift/dispersion.conf.erb'),
require => Package['swift'],
}
}
file { '/etc/logrotate.d/swift-proxy':
ensure => present,
- source => 'puppet:///modules/swift_new/swift-proxy.logrotate.conf',
+ source => 'puppet:///modules/swift/swift-proxy.logrotate.conf',
mode => '0444',
}
rsyslog::conf { 'swift-proxy':
- source => 'puppet:///modules/swift_new/swift-proxy.rsyslog.conf',
+ source => 'puppet:///modules/swift/swift-proxy.rsyslog.conf',
priority => 30,
}
@@ -54,7 +54,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- source => 'puppet:///modules/swift_new/SwiftMedia/wmf/',
+ source => 'puppet:///modules/swift/SwiftMedia/wmf/',
recurse => 'remote',
}
}
diff --git a/modules/swift_new/manifests/ring.pp
b/modules/swift/manifests/ring.pp
similarity index 92%
rename from modules/swift_new/manifests/ring.pp
rename to modules/swift/manifests/ring.pp
index ea461a7..8cbb833 100644
--- a/modules/swift_new/manifests/ring.pp
+++ b/modules/swift/manifests/ring.pp
@@ -1,6 +1,6 @@
# XXX support additional storage policies
-class swift_new::ring (
- $swift_cluster = $swift_new::params::swift_cluster,
+class swift::ring (
+ $swift_cluster = $swift::params::swift_cluster,
) {
file { '/etc/swift/account.builder':
ensure => present,
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift/manifests/stats/accounts.pp
similarity index 61%
rename from modules/swift_new/manifests/stats/accounts.pp
rename to modules/swift/manifests/stats/accounts.pp
index e0f6cde..7cb8096 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift/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,
+class swift::stats::accounts(
+ $swift_cluster = $::swift::params::swift_cluster,
+ $accounts = $::swift::params::accounts,
+ $credentials = $::swift::params::account_keys,
$statsd_host = 'statsd.eqiad.wmnet',
- $statsd_prefix = "swift.${::swift_new::params::swift_cluster}.stats",
+ $statsd_prefix = "swift.${::swift::params::swift_cluster}.stats",
) {
$required_packages = [
Package['python-swiftclient'],
@@ -17,12 +17,12 @@
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///modules/swift_new/swift-account-stats',
+ source => 'puppet:///modules/swift/swift-account-stats',
require => $required_packages,
}
$account_names = sort(keys($accounts))
- swift_new::stats::stats_account { $account_names:
+ swift::stats::stats_account { $account_names:
accounts => $accounts,
statsd_prefix => $statsd_prefix,
statsd_host => $statsd_host,
diff --git a/modules/swift_new/manifests/stats/dispersion.pp
b/modules/swift/manifests/stats/dispersion.pp
similarity index 76%
rename from modules/swift_new/manifests/stats/dispersion.pp
rename to modules/swift/manifests/stats/dispersion.pp
index d5c2868..09bc217 100644
--- a/modules/swift_new/manifests/stats/dispersion.pp
+++ b/modules/swift/manifests/stats/dispersion.pp
@@ -1,7 +1,7 @@
-class swift_new::stats::dispersion(
- $swift_cluster = $::swift_new::params::swift_cluster,
+class swift::stats::dispersion(
+ $swift_cluster = $::swift::params::swift_cluster,
$statsd_host = 'statsd.eqiad.wmnet',
- $statsd_prefix = "swift.${::swift_new::params::swift_cluster}.dispersion",
+ $statsd_prefix = "swift.${::swift::params::swift_cluster}.dispersion",
) {
$required_packages = [
Package['python-swiftclient'],
@@ -14,7 +14,7 @@
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///modules/swift_new/swift-dispersion-stats',
+ source => 'puppet:///modules/swift/swift-dispersion-stats',
require => $required_packages,
}
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift/manifests/stats/stats_account.pp
similarity index 95%
rename from modules/swift_new/manifests/stats/stats_account.pp
rename to modules/swift/manifests/stats/stats_account.pp
index b8c994b..08b953b 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift/manifests/stats/stats_account.pp
@@ -1,4 +1,4 @@
-define swift_new::stats::stats_account (
+define swift::stats::stats_account (
$accounts,
$statsd_prefix,
$statsd_host,
diff --git a/modules/swift_new/manifests/storage.pp
b/modules/swift/manifests/storage.pp
similarity index 89%
rename from modules/swift_new/manifests/storage.pp
rename to modules/swift/manifests/storage.pp
index 5bbcab8..42758f7 100644
--- a/modules/swift_new/manifests/storage.pp
+++ b/modules/swift/manifests/storage.pp
@@ -1,4 +1,4 @@
-class swift_new::storage (
+class swift::storage (
$statsd_host = undef,
$statsd_metric_prefix = undef,
$statsd_sample_rate_factor = '1',
@@ -48,15 +48,15 @@
}
file { '/etc/swift/account-server.conf':
- content => template('swift_new/account-server.conf.erb'),
+ content => template('swift/account-server.conf.erb'),
}
file { '/etc/swift/container-server.conf':
- content => template('swift_new/container-server.conf.erb'),
+ content => template('swift/container-server.conf.erb'),
}
file { '/etc/swift/object-server.conf':
- content => template('swift_new/object-server.conf.erb'),
+ content => template('swift/object-server.conf.erb'),
}
file { '/srv/swift-storage':
@@ -97,13 +97,13 @@
owner => 'root',
group => 'root',
mode => '0755',
- source => 'puppet:///modules/swift_new/swift-drive-audit',
+ source => 'puppet:///modules/swift/swift-drive-audit',
}
file { '/etc/swift/swift-drive-audit.conf':
owner => 'root',
group => 'root',
mode => '0440',
- source => 'puppet:///modules/swift_new/swift-drive-audit.conf',
+ source => 'puppet:///modules/swift/swift-drive-audit.conf',
}
cron { 'swift-drive-audit':
ensure => present,
diff --git a/modules/swift_new/manifests/storage/monitor_swift_daemon.pp
b/modules/swift/manifests/storage/monitor_swift_daemon.pp
similarity index 87%
rename from modules/swift_new/manifests/storage/monitor_swift_daemon.pp
rename to modules/swift/manifests/storage/monitor_swift_daemon.pp
index fefb3a5..3c6e523 100644
--- a/modules/swift_new/manifests/storage/monitor_swift_daemon.pp
+++ b/modules/swift/manifests/storage/monitor_swift_daemon.pp
@@ -1,4 +1,4 @@
-define swift_new::storage::monitor_swift_daemon {
+define swift::storage::monitor_swift_daemon {
include nrpe
# nrpe::monitor_service will create
diff --git a/modules/swift_new/manifests/storage/monitoring.pp
b/modules/swift/manifests/storage/monitoring.pp
similarity index 88%
rename from modules/swift_new/manifests/storage/monitoring.pp
rename to modules/swift/manifests/storage/monitoring.pp
index d957918..d3cd67c 100644
--- a/modules/swift_new/manifests/storage/monitoring.pp
+++ b/modules/swift/manifests/storage/monitoring.pp
@@ -1,8 +1,8 @@
-class swift_new::storage::monitoring {
+class swift::storage::monitoring {
include nrpe
# RT-2593. Moved here from nrpe_local.cfg
- swift_new::storage::monitor_swift_daemon { [
+ swift::storage::monitor_swift_daemon { [
'swift-account-auditor',
'swift-account-reaper',
'swift-account-replicator',
diff --git a/modules/swift_new/templates/account-server.conf.erb
b/modules/swift/templates/account-server.conf.erb
similarity index 100%
rename from modules/swift_new/templates/account-server.conf.erb
rename to modules/swift/templates/account-server.conf.erb
diff --git a/modules/swift_new/templates/container-server.conf.erb
b/modules/swift/templates/container-server.conf.erb
similarity index 100%
rename from modules/swift_new/templates/container-server.conf.erb
rename to modules/swift/templates/container-server.conf.erb
diff --git a/modules/swift_new/templates/container-sync-realms.conf.erb
b/modules/swift/templates/container-sync-realms.conf.erb
similarity index 100%
rename from modules/swift_new/templates/container-sync-realms.conf.erb
rename to modules/swift/templates/container-sync-realms.conf.erb
diff --git a/modules/swift_new/templates/dispersion.conf.erb
b/modules/swift/templates/dispersion.conf.erb
similarity index 100%
rename from modules/swift_new/templates/dispersion.conf.erb
rename to modules/swift/templates/dispersion.conf.erb
diff --git a/modules/swift_new/templates/object-server.conf.erb
b/modules/swift/templates/object-server.conf.erb
similarity index 100%
rename from modules/swift_new/templates/object-server.conf.erb
rename to modules/swift/templates/object-server.conf.erb
diff --git a/modules/swift_new/templates/proxy-server.conf.erb
b/modules/swift/templates/proxy-server.conf.erb
similarity index 100%
rename from modules/swift_new/templates/proxy-server.conf.erb
rename to modules/swift/templates/proxy-server.conf.erb
diff --git a/modules/swift_new/templates/swift.conf.erb
b/modules/swift/templates/swift.conf.erb
similarity index 100%
rename from modules/swift_new/templates/swift.conf.erb
rename to modules/swift/templates/swift.conf.erb
diff --git a/modules/swift_new/manifests/container_sync.pp
b/modules/swift_new/manifests/container_sync.pp
deleted file mode 100644
index e090099..0000000
--- a/modules/swift_new/manifests/container_sync.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class swift_new::container_sync (
- $replication_accounts = $::swift_new::params::replication_accounts,
- $replication_keys = $::swift_new::params::replication_keys,
-) {
- file { '/etc/swift/container-sync-realms.conf':
- ensure => present,
- mode => '0440',
- owner => 'swift',
- group => 'swift',
- content => template('swift_new/container-sync-realms.conf.erb'),
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/231240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22102da8b14a31719927355ff3efbe19717fcfae
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
