From 0316a64d82a0474b4ebd08a5eaa5fa2308a2561d Mon Sep 17 00:00:00 2001 From: Nikita Koshikov Date: Wed, 25 Nov 2015 11:36:59 +0200 Subject: [PATCH] Extend nova quota support Added quota_server_groups and quota_server_group_members options to quota class Change-Id: I2d05d6301875981c559f0696e51ed55e6e415470 --- manifests/quota.pp | 12 ++++++++++++ spec/classes/nova_quota_spec.rb | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/manifests/quota.pp b/manifests/quota.pp index a9f7fa4d9..8e14395c2 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -76,6 +76,14 @@ # (optional) Number of key pairs # Defaults to 100 # +# [*quota_server_groups*] +# (optional) Number of server groups per project +# Defaults to 10 +# +# [*quota_server_group_members*] +# (optional) Number of servers per server group +# Defaults to 10 +# # [*reservation_expire*] # (optional) Time until reservations expire in seconds # Defaults to 86400 @@ -105,6 +113,8 @@ class nova::quota( $quota_security_groups = 10, $quota_security_group_rules = 20, $quota_key_pairs = 100, + $quota_server_groups = 10, + $quota_server_group_members = 10, $reservation_expire = 86400, $until_refresh = 0, $max_age = 0, @@ -164,6 +174,8 @@ class nova::quota( 'DEFAULT/quota_security_groups': value => $quota_security_groups; 'DEFAULT/quota_security_group_rules': value => $quota_security_group_rules; 'DEFAULT/quota_key_pairs': value => $quota_key_pairs; + 'DEFAULT/quota_server_groups': value => $quota_server_groups; + 'DEFAULT/quota_server_group_members': value => $quota_server_group_members; 'DEFAULT/reservation_expire': value => $reservation_expire; 'DEFAULT/until_refresh': value => $until_refresh; 'DEFAULT/max_age': value => $max_age; diff --git a/spec/classes/nova_quota_spec.rb b/spec/classes/nova_quota_spec.rb index c5545055d..273362cf8 100644 --- a/spec/classes/nova_quota_spec.rb +++ b/spec/classes/nova_quota_spec.rb @@ -19,6 +19,8 @@ describe 'nova::quota' do :quota_security_groups => 10, :quota_security_group_rules => 20, :quota_key_pairs => 100, + :quota_server_groups => 10, + :quota_server_group_members => 10, :reservation_expire => 86400, :until_refresh => 0, :max_age => 0, @@ -56,6 +58,8 @@ describe 'nova::quota' do :quota_security_groups => 20, :quota_security_group_rules => 40, :quota_key_pairs => 200, + :quota_server_groups => 20, + :quota_server_group_members => 20, :reservation_expire => 6400, :until_refresh => 30, :max_age => 60