openstack/puppet-nova
Code Issues Proposed changes

Support workers number of EC2 service

Browse Source 
Beside Nova API & metadata, bring workers management support to EC2
service.

Change-Id: I9617aa971558534eaf84dd3e5e912411918d4497
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-09-15 09:28:58 -04:00
parent ae171f93ed
commit 8a63ea41d5
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@@ -85,6 +85,10 @@
# (optional) Number of workers for OpenStack API service # (optional) Number of workers for OpenStack API service
# Defaults to $::processorcount # Defaults to $::processorcount
# #
# [*ec2_workers*]
# (optional) Number of workers for EC2 service
# Defaults to $::processorcount
#
# [*metadata_workers*] # [*metadata_workers*]
# (optional) Number of workers for metadata service # (optional) Number of workers for metadata service
# Defaults to $::processorcount # Defaults to $::processorcount
@@ -137,6 +141,7 @@ class nova::api(
$volume_api_class = 'nova.volume.cinder.API', $volume_api_class = 'nova.volume.cinder.API',
$use_forwarded_for = false, $use_forwarded_for = false,
$osapi_compute_workers = $::processorcount, $osapi_compute_workers = $::processorcount,
$ec2_workers = $::processorcount,
$metadata_workers = $::processorcount, $metadata_workers = $::processorcount,
$sync_db = true, $sync_db = true,
$neutron_metadata_proxy_shared_secret = undef, $neutron_metadata_proxy_shared_secret = undef,
@@ -193,6 +198,7 @@ class nova::api(
'DEFAULT/metadata_listen': value => $metadata_listen; 'DEFAULT/metadata_listen': value => $metadata_listen;
'DEFAULT/osapi_volume_listen': value => $api_bind_address; 'DEFAULT/osapi_volume_listen': value => $api_bind_address;
'DEFAULT/osapi_compute_workers': value => $osapi_compute_workers_real; 'DEFAULT/osapi_compute_workers': value => $osapi_compute_workers_real;
'DEFAULT/ec2_workers': value => $ec2_workers;
'DEFAULT/metadata_workers': value => $metadata_workers; 'DEFAULT/metadata_workers': value => $metadata_workers;
'DEFAULT/use_forwarded_for': value => $use_forwarded_for; 'DEFAULT/use_forwarded_for': value => $use_forwarded_for;
'osapi_v3/enabled': value => $osapi_v3; 'osapi_v3/enabled': value => $osapi_v3;

1
spec/classes/nova_api_spec.rb
View File

@@ -59,6 +59,7 @@ describe 'nova::api' do
should contain_nova_config('DEFAULT/metadata_listen').with('value' => '0.0.0.0') should contain_nova_config('DEFAULT/metadata_listen').with('value' => '0.0.0.0')
should contain_nova_config('DEFAULT/osapi_volume_listen').with('value' => '0.0.0.0') should contain_nova_config('DEFAULT/osapi_volume_listen').with('value' => '0.0.0.0')
should contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5') should contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '5')
should contain_nova_config('DEFAULT/ec2_workers').with('value' => '5')
should contain_nova_config('DEFAULT/metadata_workers').with('value' => '5') should contain_nova_config('DEFAULT/metadata_workers').with('value' => '5')
end end