stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #484 from enovance/fix_invalid_parameter_issue

Browse Source 
Apply changes for swift to compile
This commit is contained in:
Emilien Macchi
2014-06-02 22:01:30 +02:00
parent cdacaf1439 e4786ef4b7
commit 98d7e941d9
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@@ -17,7 +17,7 @@ fixtures:
ref: '36383e90d1c4013d7989561b00ffcb08c76908de' ref: '36383e90d1c4013d7989561b00ffcb08c76908de'
'swift': 'swift':
repo: 'git://github.com/enovance/puppet-swift' repo: 'git://github.com/enovance/puppet-swift'
ref: '9874edd2655e122bf8bd3eedc70e697bc5b83326' ref: 'f7d1385d6990492705ddaa228ffa544ca235913a'
'neutron': 'neutron':
repo: 'git://github.com/enovance/puppet-neutron' repo: 'git://github.com/enovance/puppet-neutron'
ref: '66c436bc2f06c5a71d79c674697394a11ec227f9' ref: '66c436bc2f06c5a71d79c674697394a11ec227f9'

2
Puppetfile
View File

@@ -43,7 +43,7 @@ mod 'nova',
:ref => '0249428f294217c2ad5fb75f8d0a0bafac12fe9c' :ref => '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
mod 'swift', mod 'swift',
:git => 'git://github.com/enovance/puppet-swift.git', :git => 'git://github.com/enovance/puppet-swift.git',
:ref => '9874edd2655e122bf8bd3eedc70e697bc5b83326' :ref => 'f7d1385d6990492705ddaa228ffa544ca235913a'
# Dependency # Dependency
mod 'apache', mod 'apache',

4
manifests/object/ringbuilder.pp
View File

@@ -23,10 +23,6 @@ class cloud::object::ringbuilder(
include cloud::object include cloud::object
Ring_object_device <<| |>>
Ring_container_device <<| |>>
Ring_account_device <<| |>>
class {'swift::ringbuilder' : class {'swift::ringbuilder' :
part_power => 15, part_power => 15,
replicas => $replicas, replicas => $replicas,

2
manifests/object/storage.pp
View File

@@ -81,7 +81,7 @@ allow_versions = on
swift::storage::filter::healthcheck { $swift_components : } swift::storage::filter::healthcheck { $swift_components : }
create_resources("swift::storage::${fstype}", $device_config_hash) create_resources("swift::storage::${fstype}", $device_config_hash)
create_resources('cloud::object::set_io_scheduler', $device_config_hash) ensure_resource('cloud::object::set_io_scheduler', keys($device_config_hash))
@@ring_container_device { "${storage_eth}:${container_port}/${ring_container_device}": @@ring_container_device { "${storage_eth}:${container_port}/${ring_container_device}":
zone => $swift_zone, zone => $swift_zone,