openstack/puppet-nova
Code Issues Proposed changes

Merge "api: add default_floating_pool parameter"

Browse Source
This commit is contained in:
Jenkins
2015-09-21 17:56:02 +00:00
committed by Gerrit Code Review
parent f3cbca7a31 83ea9464a5
commit 3306232e8b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@@ -126,6 +126,10 @@
# (optional) Enable or not Nova API v3
# Defaults to false
#
# [*default_floating_pool*]
# (optional) Default pool for floating IPs
# Defaults to 'nova'
#
# [*validate*]
# (optional) Whether to validate the service is working after any service refreshes
# Defaults to false
@@ -168,6 +172,7 @@ class nova::api(
$sync_db = true,
$neutron_metadata_proxy_shared_secret = undef,
$osapi_v3 = false,
$default_floating_pool = 'nova',
$pci_alias = undef,
$ratelimits = undef,
$ratelimits_factory =
@@ -220,6 +225,7 @@ class nova::api(
'DEFAULT/ec2_workers': value => $ec2_workers;
'DEFAULT/metadata_workers': value => $metadata_workers;
'DEFAULT/use_forwarded_for': value => $use_forwarded_for;
'DEFAULT/default_floating_pool': value => $default_floating_pool;
'osapi_v3/enabled': value => $osapi_v3;
}

3
spec/classes/nova_api_spec.rb
View File

@@ -64,6 +64,7 @@ describe 'nova::api' do
is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5')
is_expected.to contain_nova_config('DEFAULT/ec2_workers').with('value' => '5')
is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '5')
is_expected.to contain_nova_config('DEFAULT/default_floating_pool').with('value' => 'nova')
end
it 'do not configure v3 api' do
@@ -98,6 +99,7 @@ describe 'nova::api' do
:neutron_metadata_proxy_shared_secret => 'secrete',
:osapi_compute_workers => 1,
:metadata_workers => 2,
:default_floating_pool => 'public',
:osapi_v3 => true,
:keystone_ec2_url => 'https://example.com:5000/v2.0/ec2tokens',
:pci_alias => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\",\"name\":\"graphic_card\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"name\":\"network_card\"}]"
@@ -150,6 +152,7 @@ describe 'nova::api' do
is_expected.to contain_nova_config('DEFAULT/use_forwarded_for').with('value' => false)
is_expected.to contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '1')
is_expected.to contain_nova_config('DEFAULT/metadata_workers').with('value' => '2')
is_expected.to contain_nova_config('DEFAULT/default_floating_pool').with('value' => 'public')
is_expected.to contain_nova_config('neutron/service_metadata_proxy').with('value' => true)
is_expected.to contain_nova_config('neutron/metadata_proxy_shared_secret').with('value' => 'secrete')
is_expected.to contain_nova_config('DEFAULT/keystone_ec2_url').with('value' => 'https://example.com:5000/v2.0/ec2tokens')