stackforge
/
puppet-openstack
Code Issues Proposed changes

Ensure swift.conf created in all scenarios 

Change I60fb78e5d40605ab47f349d154737ef9bab641f4 introduced a bug
wherein /etc/swift/swift.conf is getting created in consolidated
installs in which openstack::swift::proxy and
openstack::swift::storage-node classes are both applied to the same
server, but is not getting created on storage nodes in distributed
installs in which the proxy and storage-node classes are applied to
different servers.

Use ensure_resource wrappers around the swift class call to correct.

Change-Id: I692ddf5f344577705fc6a8652349f480ad21542d
Closes-Bug: 1287349
This commit is contained in:
Chris Ricker 2014-03-03 12:34:43 -08:00
parent 0cbddbcea0
commit 472253cbe2
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': {