openstack/puppet-swift
Code Issues Proposed changes

Merge "Fix puppet-lint warnings about ensure"

Browse Source
This commit is contained in:
Jenkins 2013-08-28 18:10:27 +00:00 committed by Gerrit Code Review
commit 943c2f0c6e
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -31,14 +31,14 @@ class swift(
if !defined(Package['swift']) { if !defined(Package['swift']) {
package { 'swift': package { 'swift':
name => $::swift::params::package_name,
ensure => $package_ensure, ensure => $package_ensure,
name => $::swift::params::package_name,
} }
} }
package { 'swiftclient': package { 'swiftclient':
name => $::swift::params::client_package,
ensure => $package_ensure, ensure => $package_ensure,
name => $::swift::params::client_package,
} }
File { owner => 'swift', group => 'swift', require => Package['swift'] } File { owner => 'swift', group => 'swift', require => Package['swift'] }

4
manifests/proxy.pp
View File

@ -81,8 +81,8 @@ class swift::proxy(
} }
package { 'swift-proxy': package { 'swift-proxy':
name => $::swift::params::proxy_package_name,
ensure => $package_ensure, ensure => $package_ensure,
name => $::swift::params::proxy_package_name,
} }
concat { '/etc/swift/proxy-server.conf': concat { '/etc/swift/proxy-server.conf':
@ -113,8 +113,8 @@ class swift::proxy(
} }
service { 'swift-proxy': service { 'swift-proxy':
name => $::swift::params::proxy_service_name,
ensure => running, ensure => running,
name => $::swift::params::proxy_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
hasstatus => true, hasstatus => true,

2
manifests/proxy/swift3.pp
View File

@ -21,8 +21,8 @@ class swift::proxy::swift3(
include swift::params include swift::params
package { 'swift-plugin-s3': package { 'swift-plugin-s3':
name => $::swift::params::swift3,
ensure => $ensure, ensure => $ensure,
name => $::swift::params::swift3,
} }
concat::fragment { 'swift_swift3': concat::fragment { 'swift_swift3':

4
manifests/storage/account.pp
View File

@ -6,16 +6,16 @@ class swift::storage::account(
} }
service { 'swift-account-reaper': service { 'swift-account-reaper':
name => $::swift::params::account_reaper_service_name,
ensure => running, ensure => running,
name => $::swift::params::account_reaper_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-account'], require => Package['swift-account'],
} }
service { 'swift-account-auditor': service { 'swift-account-auditor':
name => $::swift::params::account_auditor_service_name,
ensure => running, ensure => running,
name => $::swift::params::account_auditor_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-account'], require => Package['swift-account'],

4
manifests/storage/container.pp
View File

@ -13,15 +13,15 @@ class swift::storage::container(
} }
service { 'swift-container-updater': service { 'swift-container-updater':
name => $::swift::params::container_updater_service_name,
ensure => running, ensure => running,
name => $::swift::params::container_updater_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-container'], require => Package['swift-container'],
} }
service { 'swift-container-auditor': service { 'swift-container-auditor':
name => $::swift::params::container_auditor_service_name,
ensure => running, ensure => running,
name => $::swift::params::container_auditor_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-container'], require => Package['swift-container'],

2
manifests/storage/disk.pp
View File

@ -40,9 +40,9 @@ define swift::storage::disk(
if(!defined(File[$mnt_base_dir])) { if(!defined(File[$mnt_base_dir])) {
file { $mnt_base_dir: file { $mnt_base_dir:
ensure => directory,
owner => 'swift', owner => 'swift',
group => 'swift', group => 'swift',
ensure => directory,
} }
} }

6
manifests/storage/generic.pp
View File

@ -29,10 +29,10 @@ define swift::storage::generic(
validate_re($name, '^object|container|account$') validate_re($name, '^object|container|account$')
package { "swift-${name}": package { "swift-${name}":
ensure => $package_ensure,
# this is a way to dynamically build the variables to lookup # this is a way to dynamically build the variables to lookup
# sorry its so ugly :( # sorry its so ugly :(
name => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"), name => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"),
ensure => $package_ensure,
before => Service["swift-${name}", "swift-${name}-replicator"], before => Service["swift-${name}", "swift-${name}-replicator"],
} }
@ -43,8 +43,8 @@ define swift::storage::generic(
} }
service { "swift-${name}": service { "swift-${name}":
name => inline_template("<%= scope.lookupvar('::swift::params::${name}_service_name') %>"),
ensure => running, ensure => running,
name => inline_template("<%= scope.lookupvar('::swift::params::${name}_service_name') %>"),
enable => true, enable => true,
hasstatus => true, hasstatus => true,
provider => $service_provider, provider => $service_provider,
@ -52,8 +52,8 @@ define swift::storage::generic(
} }
service { "swift-${name}-replicator": service { "swift-${name}-replicator":
name => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
ensure => running, ensure => running,
name => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
enable => true, enable => true,
hasstatus => true, hasstatus => true,
provider => $service_provider, provider => $service_provider,

2
manifests/storage/loopback.pp
View File

@ -22,9 +22,9 @@ define swift::storage::loopback(
if(!defined(File[$mnt_base_dir])) { if(!defined(File[$mnt_base_dir])) {
file { $mnt_base_dir: file { $mnt_base_dir:
ensure => directory,
owner => 'swift', owner => 'swift',
group => 'swift', group => 'swift',
ensure => directory,
} }
} }

4
manifests/storage/object.pp
View File

@ -6,15 +6,15 @@ class swift::storage::object(
} }
service { 'swift-object-updater': service { 'swift-object-updater':
name => $::swift::params::object_updater_service_name,
ensure => running, ensure => running,
name => $::swift::params::object_updater_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-object'], require => Package['swift-object'],
} }
service { 'swift-object-auditor': service { 'swift-object-auditor':
name => $::swift::params::object_auditor_service_name,
ensure => running, ensure => running,
name => $::swift::params::object_auditor_service_name,
enable => true, enable => true,
provider => $::swift::params::service_provider, provider => $::swift::params::service_provider,
require => Package['swift-object'], require => Package['swift-object'],

2
manifests/storage/xfs.pp
View File

@ -32,9 +32,9 @@ define swift::storage::xfs(
if(!defined(File[$mnt_base_dir])) { if(!defined(File[$mnt_base_dir])) {
file { $mnt_base_dir: file { $mnt_base_dir:
ensure => directory,
owner => 'swift', owner => 'swift',
group => 'swift', group => 'swift',
ensure => directory,
} }
} }