openstack/puppet-nova
Code Issues Proposed changes

Merge "Add API V3 support"

Browse Source
This commit is contained in:
Jenkins
2014-05-12 11:45:06 +00:00
committed by Gerrit Code Review
parent b73cc70a0d cd2cf2ebb8
commit 0249428f29
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/api.pp
View File

@@ -107,6 +107,9 @@
# (optional) The rate limiting factory to use # (optional) The rate limiting factory to use
# Defaults to 'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory' # Defaults to 'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory'
# #
# [*osapi_v3*]
# (optional) Enable or not Nova API v3
# Defaults to false
class nova::api( class nova::api(
$admin_password, $admin_password,
$enabled = false, $enabled = false,
@@ -131,6 +134,7 @@ class nova::api(
$conductor_workers = $::processorcount, $conductor_workers = $::processorcount,
$sync_db = true, $sync_db = true,
$neutron_metadata_proxy_shared_secret = undef, $neutron_metadata_proxy_shared_secret = undef,
$osapi_v3 = false,
$ratelimits = undef, $ratelimits = undef,
$ratelimits_factory = $ratelimits_factory =
'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory', 'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory',
@@ -181,6 +185,7 @@ class nova::api(
'DEFAULT/metadata_workers': value => $metadata_workers; 'DEFAULT/metadata_workers': value => $metadata_workers;
'conductor/workers': value => $conductor_workers; 'conductor/workers': value => $conductor_workers;
'DEFAULT/use_forwarded_for': value => $use_forwarded_for; 'DEFAULT/use_forwarded_for': value => $use_forwarded_for;
'osapi_v3/enabled': value => $osapi_v3;
} }
if ($neutron_metadata_proxy_shared_secret){ if ($neutron_metadata_proxy_shared_secret){

9
spec/classes/nova_api_spec.rb
View File

@@ -63,6 +63,10 @@ describe 'nova::api' do
should contain_nova_config('conductor/workers').with('value' => '5') should contain_nova_config('conductor/workers').with('value' => '5')
end end
it 'do not configure v3 api' do
should contain_nova_config('osapi_v3/enabled').with('value' => false)
end
it 'unconfigures neutron_metadata proxy' do it 'unconfigures neutron_metadata proxy' do
should contain_nova_config('DEFAULT/service_neutron_metadata_proxy').with(:value => false) should contain_nova_config('DEFAULT/service_neutron_metadata_proxy').with(:value => false)
should contain_nova_config('DEFAULT/neutron_metadata_proxy_shared_secret').with(:ensure => 'absent') should contain_nova_config('DEFAULT/neutron_metadata_proxy_shared_secret').with(:ensure => 'absent')
@@ -103,6 +107,7 @@ describe 'nova::api' do
:osapi_compute_workers => 1, :osapi_compute_workers => 1,
:metadata_workers => 2, :metadata_workers => 2,
:conductor_workers => 3, :conductor_workers => 3,
:osapi_v3 => true,
}) })
end end
@@ -154,6 +159,10 @@ describe 'nova::api' do
should contain_nova_config('DEFAULT/service_neutron_metadata_proxy').with('value' => true) should contain_nova_config('DEFAULT/service_neutron_metadata_proxy').with('value' => true)
should contain_nova_config('DEFAULT/neutron_metadata_proxy_shared_secret').with('value' => 'secrete') should contain_nova_config('DEFAULT/neutron_metadata_proxy_shared_secret').with('value' => 'secrete')
end end
it 'configure nova api v3' do
should contain_nova_config('osapi_v3/enabled').with('value' => true)
end
end end
[ [