Merge pull request #15 from bodepd/feature/master/split_quota
Split quota management into its own class.
This commit is contained in:
commit
ec03153ff8
@ -15,15 +15,6 @@ class nova(
|
|||||||
$rabbit_virtual_host='/',
|
$rabbit_virtual_host='/',
|
||||||
# Following may need to be broken out to different nova services
|
# Following may need to be broken out to different nova services
|
||||||
$service_down_time = undef,
|
$service_down_time = undef,
|
||||||
$quota_instances = 10,
|
|
||||||
$quota_cores = 20,
|
|
||||||
$quota_volumes = 10,
|
|
||||||
$quota_gigabytes = 1000,
|
|
||||||
$quota_floating_ips = 10,
|
|
||||||
$quota_metadata_items = 128,
|
|
||||||
$quota_max_injected_files = 5,
|
|
||||||
$quota_max_injected_file_content_bytes = 10240,
|
|
||||||
$quota_max_injected_file_path_bytes = 255,
|
|
||||||
$logdir = '/var/log/nova',
|
$logdir = '/var/log/nova',
|
||||||
$state_path = '/var/lib/nova',
|
$state_path = '/var/lib/nova',
|
||||||
$lock_path = '/var/lock/nova',
|
$lock_path = '/var/lock/nova',
|
||||||
@ -95,15 +86,6 @@ class nova(
|
|||||||
'state_path': value => $state_path;
|
'state_path': value => $state_path;
|
||||||
'lock_path': value => $lock_path;
|
'lock_path': value => $lock_path;
|
||||||
'service_down_time': value => $service_down_time;
|
'service_down_time': value => $service_down_time;
|
||||||
'quota_instances': value => $quota_instances;
|
|
||||||
'quota_cores': value => $quota_cores;
|
|
||||||
'quota_volumes': value => $quota_volumes;
|
|
||||||
'quota_gigabytes': value => $quota_gigabytes;
|
|
||||||
'quota_floating_ips': value => $quota_floating_ips;
|
|
||||||
'quota_metadata_items': value => $quota_metadata_items;
|
|
||||||
'quota_max_injected_files': value => $quota_max_injected_files;
|
|
||||||
'quota_max_injected_file_content_bytes': value => $quota_max_injected_file_content_bytes;
|
|
||||||
'quota_max_injected_file_path_bytes': value => $quota_max_injected_file_path_bytes
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $image_service == 'nova.image.glance.GlanceImageService' {
|
if $image_service == 'nova.image.glance.GlanceImageService' {
|
||||||
@ -113,7 +95,7 @@ class nova(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Nova_config<| |> {
|
Nova_config<| |> {
|
||||||
require +> Package["nova-common"],
|
require +> Package["nova-common"],
|
||||||
before +> File['/etc/nova/nova.conf']
|
before +> File['/etc/nova/nova.conf']
|
||||||
}
|
}
|
||||||
|
26
nova/manifests/quota.pp
Normal file
26
nova/manifests/quota.pp
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# class for overriding the default quota settings.
|
||||||
|
class nova::quota(
|
||||||
|
$quota_instances = 10,
|
||||||
|
$quota_cores = 20,
|
||||||
|
$quota_volumes = 10,
|
||||||
|
$quota_gigabytes = 1000,
|
||||||
|
$quota_floating_ips = 10,
|
||||||
|
$quota_metadata_items = 128,
|
||||||
|
$quota_max_injected_files = 5,
|
||||||
|
$quota_max_injected_file_content_bytes = 10240,
|
||||||
|
$quota_max_injected_file_path_bytes = 255
|
||||||
|
) {
|
||||||
|
|
||||||
|
nova_config {
|
||||||
|
'quota_instances': value => $quota_instances;
|
||||||
|
'quota_cores': value => $quota_cores;
|
||||||
|
'quota_volumes': value => $quota_volumes;
|
||||||
|
'quota_gigabytes': value => $quota_gigabytes;
|
||||||
|
'quota_floating_ips': value => $quota_floating_ips;
|
||||||
|
'quota_metadata_items': value => $quota_metadata_items;
|
||||||
|
'quota_max_injected_files': value => $quota_max_injected_files;
|
||||||
|
'quota_max_injected_file_content_bytes': value => $quota_max_injected_file_content_bytes;
|
||||||
|
'quota_max_injected_file_path_bytes': value => $quota_max_injected_file_path_bytes
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -79,6 +79,9 @@ class nova::rackspace::all(
|
|||||||
rabbit_userid => $rabbit_userid,
|
rabbit_userid => $rabbit_userid,
|
||||||
rabbit_virtual_host => $rabbit_virtual_host,
|
rabbit_virtual_host => $rabbit_virtual_host,
|
||||||
service_down_time => $service_down_time,
|
service_down_time => $service_down_time,
|
||||||
|
}
|
||||||
|
|
||||||
|
class { 'nova::quota':
|
||||||
quota_instances => $quota_instances,
|
quota_instances => $quota_instances,
|
||||||
quota_cores => $quota_cores,
|
quota_cores => $quota_cores,
|
||||||
quota_volumes => $quota_volumes,
|
quota_volumes => $quota_volumes,
|
||||||
|
Loading…
Reference in New Issue
Block a user