stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Update to latest refs

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-05-12 10:34:34 -04:00
parent 5beaf07f2f
commit c27e90ab06
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.fixtures.yml
View File

@ -8,10 +8,10 @@ fixtures:
ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d' ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d'
'nova': 'nova':
repo: 'git://github.com/enovance/puppet-nova.git' repo: 'git://github.com/enovance/puppet-nova.git'
ref: '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c' ref: '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
'glance': 'glance':
repo: 'git://github.com/enovance/puppet-glance.git' repo: 'git://github.com/enovance/puppet-glance.git'
ref: 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' ref: '8156a87cd04943904258d572e47838d0c346654f'
'horizon': 'horizon':
repo: 'git://github.com/enovance/puppet-horizon' repo: 'git://github.com/enovance/puppet-horizon'
ref: '36383e90d1c4013d7989561b00ffcb08c76908de' ref: '36383e90d1c4013d7989561b00ffcb08c76908de'

4
Puppetfile
View File

@ -25,7 +25,7 @@ mod 'cinder',
:ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2' :ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2'
mod 'glance', mod 'glance',
:git => 'git://github.com/enovance/puppet-glance.git', :git => 'git://github.com/enovance/puppet-glance.git',
:ref => 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' :ref => '8156a87cd04943904258d572e47838d0c346654f'
mod 'heat', mod 'heat',
:git => 'git://github.com/enovance/puppet-heat.git', :git => 'git://github.com/enovance/puppet-heat.git',
:ref => '17736b2fd726858cb83590f8a8b1d594a087ea44' :ref => '17736b2fd726858cb83590f8a8b1d594a087ea44'
@ -40,7 +40,7 @@ mod 'neutron',
:ref => '66c436bc2f06c5a71d79c674697394a11ec227f9' :ref => '66c436bc2f06c5a71d79c674697394a11ec227f9'
mod 'nova', mod 'nova',
:git => 'git://github.com/enovance/puppet-nova.git', :git => 'git://github.com/enovance/puppet-nova.git',
:ref => '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c' :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 => '9874edd2655e122bf8bd3eedc70e697bc5b83326'

7
manifests/volume.pp
View File

@ -92,7 +92,12 @@ class cloud::volume(
log_dir => $log_dir, log_dir => $log_dir,
log_facility => $log_facility, log_facility => $log_facility,
use_syslog => $use_syslog, use_syslog => $use_syslog,
storage_availability_zone => $storage_availability_zone # https://review.openstack.org/#/c/92993/
# storage_availability_zone => $storage_availability_zone
}
cinder_config {
'DEFAULT/storage_availability_zone': value => $storage_availability_zone
} }
class { 'cinder::ceilometer': } class { 'cinder::ceilometer': }

2
spec/classes/cloud_volume_controller_spec.rb
View File

@ -60,7 +60,7 @@ describe 'cloud::volume::controller' do
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:use_syslog => true, :use_syslog => true,
:log_dir => false, :log_dir => false,
:storage_availability_zone => 'nova' # :storage_availability_zone => 'nova'
) )
should contain_class('cinder::ceilometer') should contain_class('cinder::ceilometer')
end end

2
spec/classes/cloud_volume_storage_spec.rb
View File

@ -74,7 +74,7 @@ describe 'cloud::volume::storage' do
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:use_syslog => true, :use_syslog => true,
:log_dir => false, :log_dir => false,
:storage_availability_zone => 'nova' # :storage_availability_zone => 'nova'
) )
should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier') should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')