openstack/puppet-nova
Code Issues Proposed changes

Implement volume_api_class as an option

Browse Source
This commit is contained in:
Aimon Bustardo 2012-11-16 04:54:53 -08:00
parent 0b841f60e9
commit 5e5a14380e
3 changed files with 5 additions and 4 deletions

5
manifests/api.pp

@ -24,7 +24,8 @@ class nova::api(
$admin_user = 'nova', $admin_user = 'nova',
$admin_password = 'passw0rd', $admin_password = 'passw0rd',
$api_bind_address = '0.0.0.0', $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 include nova::params
@ -52,7 +53,7 @@ class nova::api(
nova_config { nova_config {
'api_paste_config': value => '/etc/nova/api-paste.ini'; 'api_paste_config': value => '/etc/nova/api-paste.ini';
'enabled_apis': value => $enabled_apis; '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; 'ec2_listen': value => $api_bind_address;
'osapi_compute_listen': value => $api_bind_address; 'osapi_compute_listen': value => $api_bind_address;
'metadata_listen': value => $api_bind_address; 'metadata_listen': value => $api_bind_address;

1
spec/classes/nova_api_spec.rb

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

1
spec/classes/nova_init_spec.rb

@ -76,7 +76,6 @@ describe 'nova' do
it { should contain_nova_config('rootwrap_config').with_value('/etc/nova/rootwrap.conf') } it { should contain_nova_config('rootwrap_config').with_value('/etc/nova/rootwrap.conf') }
describe 'with parameters supplied' do describe 'with parameters supplied' do
let :params do let :params do