Merge "Move swift::client to include from declared class" into stable/newton

This commit is contained in:
Jenkins 2017-06-07 10:59:54 +00:00 committed by Gerrit Code Review
commit d24b7af259
2 changed files with 9 additions and 6 deletions

View File

@ -9,14 +9,20 @@
# Defaults to 'present'.
#
class swift::client (
$ensure = 'present'
$ensure = $::swift::client_package_ensure
) {
if $ensure {
$real_ensure = $ensure
} else {
$real_ensure = 'present'
}
include ::swift::deps
include ::swift::params
package { 'swiftclient':
ensure => $ensure,
ensure => $real_ensure,
name => $::swift::params::client_package,
tag => ['openstack','swift-support-package']
}

View File

@ -58,6 +58,7 @@ class swift(
include ::swift::deps
include ::swift::params
include ::swift::client
if ($swift_hash_path_prefix == undef and $swift_hash_path_suffix == undef) {
fail('You must specify at least swift_hash_path_prefix or swift_hash_path_suffix')
@ -71,10 +72,6 @@ class swift(
}
}
class { '::swift::client':
ensure => $client_package_ensure;
}
File {
owner => 'swift',
group => 'swift',