openstack
/
puppet-nova
Code Issues Proposed changes

Merge pull request #196 from aimonb/master 

Implement volume_api_class as an option
This commit is contained in:
Dan Bode 2012-11-16 11:21:46 -08:00
parent 0b841f60e9 5e5a14380e
commit 335015f0d9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/api.pp
View File

@ -24,7 +24,8 @@ class nova::api(
$admin_user = 'nova',
$admin_password = 'passw0rd',
$api_bind_address = '0.0.0.0',
$enabled_apis = 'ec2,osapi_compute,metadata'
$enabled_apis = 'ec2,osapi_compute,metadata',
$volume_api_class = 'nova.volume.cinder.API'
) {
include nova::params
@ -52,7 +53,7 @@ class nova::api(
nova_config {
'api_paste_config': value => '/etc/nova/api-paste.ini';
'enabled_apis': value => $enabled_apis;
'volume_api_class': value => 'nova.volume.cinder.API';
'volume_api_class': value => $volume_api_class;
'ec2_listen': value => $api_bind_address;
'osapi_compute_listen': value => $api_bind_address;
'metadata_listen': value => $api_bind_address;

1
spec/classes/nova_api_spec.rb
View File

@ -73,6 +73,7 @@ describe 'nova::api' do
:admin_user => 'nova2',
:admin_password => 'passw0rd2',
:api_bind_address => '192.168.56.210',
:volume_api_class => 'nova.volume.cinder.API'
}
end
it 'should use default params for api-paste.init' do

3
spec/classes/nova_init_spec.rb
View File

@ -74,8 +74,7 @@ describe 'nova' do
it { should contain_nova_config('lock_path').with_value('/var/lock/nova') }
it { should contain_nova_config('service_down_time').with_value('60') }
it { should contain_nova_config('rootwrap_config').with_value('/etc/nova/rootwrap.conf') }
describe 'with parameters supplied' do