summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-07 10:59:54 +0000
committerGerrit Code Review <review@openstack.org>2017-06-07 10:59:54 +0000
commitd24b7af2593cd4871d044bb9c8af9aba8e93b09e (patch)
tree3213968f0b93b9fd3bacfb9806fd647b3c229ecf
parentf5fdfd7b6063f8f02b91e86b99b5cf82335800d5 (diff)
parent9e32a6aca30d67148b6364414152879824791f1e (diff)
Merge "Move swift::client to include from declared class" into stable/newton
-rw-r--r--manifests/client.pp10
-rw-r--r--manifests/init.pp5
2 files changed, 9 insertions, 6 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index b52af79..79b8f3e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -9,14 +9,20 @@
9# Defaults to 'present'. 9# Defaults to 'present'.
10# 10#
11class swift::client ( 11class swift::client (
12 $ensure = 'present' 12 $ensure = $::swift::client_package_ensure
13) { 13) {
14 14
15 if $ensure {
16 $real_ensure = $ensure
17 } else {
18 $real_ensure = 'present'
19 }
20
15 include ::swift::deps 21 include ::swift::deps
16 include ::swift::params 22 include ::swift::params
17 23
18 package { 'swiftclient': 24 package { 'swiftclient':
19 ensure => $ensure, 25 ensure => $real_ensure,
20 name => $::swift::params::client_package, 26 name => $::swift::params::client_package,
21 tag => ['openstack','swift-support-package'] 27 tag => ['openstack','swift-support-package']
22 } 28 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 99da904..1d9b17a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -58,6 +58,7 @@ class swift(
58 58
59 include ::swift::deps 59 include ::swift::deps
60 include ::swift::params 60 include ::swift::params
61 include ::swift::client
61 62
62 if ($swift_hash_path_prefix == undef and $swift_hash_path_suffix == undef) { 63 if ($swift_hash_path_prefix == undef and $swift_hash_path_suffix == undef) {
63 fail('You must specify at least swift_hash_path_prefix or swift_hash_path_suffix') 64 fail('You must specify at least swift_hash_path_prefix or swift_hash_path_suffix')
@@ -71,10 +72,6 @@ class swift(
71 } 72 }
72 } 73 }
73 74
74 class { '::swift::client':
75 ensure => $client_package_ensure;
76 }
77
78 File { 75 File {
79 owner => 'swift', 76 owner => 'swift',
80 group => 'swift', 77 group => 'swift',