stackforge
/
puppet-openstack
Code Issues Proposed changes

Merge "Ensure swift.conf created in all scenarios"

This commit is contained in:
Jenkins 2014-03-05 21:46:55 +00:00 committed by Gerrit Code Review
parent 2840cc60e6 472253cbe2
commit f2b7397fb6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/swift/proxy.pp
View File

@ -32,10 +32,12 @@ class openstack::swift::proxy (
} else {
$real_keystone_host = $keystone_host
}
class { 'swift':
swift_hash_suffix => $swift_hash_suffix,
package_ensure => $package_ensure,
}
ensure_resource('class', 'swift',
{ swift_hash_suffix => $swift_hash_suffix,
package_ensure => $package_ensure,
}
)
if $memcached {
class { 'memcached':

7
manifests/swift/storage-node.pp
View File

@ -12,12 +12,11 @@ class openstack::swift::storage-node (
$byte_size = '1024',
) {
if !defined(swift){
class { 'swift':
swift_hash_suffix => $swift_hash_suffix,
ensure_resource('class', 'swift',
{ swift_hash_suffix => $swift_hash_suffix,
package_ensure => $package_ensure,
}
}
)
case $storage_type {
'loopback': {