stackforge
/
puppet-openstack
Code Issues Proposed changes

Allow running of proxy and storage on the same node. 

This adds a if defined check to avoid class conflicts
when running swift proxy and storage on the same node.

Change-Id: I60fb78e5d40605ab47f349d154737ef9bab641f4
This commit is contained in:
cbaesema 2013-12-17 13:47:25 -06:00
parent a936e2b7b7
commit 4b9e74a7a2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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