From 3dfcb77c5846df6d364b63ab782be03615df90b1 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Wed, 15 Jul 2015 23:39:41 -0700 Subject: [PATCH] Allow configuration of all default quota options Add all remaining configurable default quota options for nova, neutron, and cinder. Change-Id: I3bbbba2f2ca9495c7060ffa5ac5d70e865758518 Closes-Bug: #1446431 --- defaults/main.yml | 12 ++++++++++++ templates/nova.conf.j2 | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 6a6a28aa..d496d77c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -193,9 +193,21 @@ nova_remove_unused_resized_minimum_age_seconds: 3600 nova_image_cache_manager_interval: 0 # Nova quota +nova_quota_cores: 20 +nova_quota_fixed_ips: -1 +nova_quota_floating_ips: 10 nova_quota_injected_file_content_bytes: 10240 nova_quota_injected_file_path_length: 255 nova_quota_injected_files: 5 +nova_quota_instances: 10 +nova_quota_key_pairs: 100 +nova_quota_metadata_items: 128 +nova_quota_networks: 3 +nova_quota_ram: 51200 +nova_quota_security_group_rules: 20 +nova_quota_security_groups: 10 +nova_quota_server_group_members: 10 +nova_quota_server_groups: 10 # Nova Scheduler nova_cpu_allocation_ratio: 2.0 diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index f31d0e7d..d81b73a5 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -14,9 +14,21 @@ rootwrap_config = /etc/nova/rootwrap.conf service_down_time = 120 # Quota +quota_cores = {{ nova_quota_cores }} +quota_fixed_ips = {{ nova_quota_fixed_ips }} +quota_floating_ips = {{ nova_quota_floating_ips }} quota_injected_file_content_bytes = {{ nova_quota_injected_file_content_bytes }} quota_injected_file_path_length = {{ nova_quota_injected_file_path_length }} quota_injected_files = {{ nova_quota_injected_files }} +quota_instances = {{ nova_quota_instances }} +quota_key_pairs = {{ nova_quota_key_pairs }} +quota_metadata_items = {{ nova_quota_metadata_items }} +quota_networks = {{ nova_quota_networks }} +quota_ram = {{ nova_quota_ram }} +quota_security_group_rules = {{ nova_quota_security_group_rules }} +quota_security_groups = {{ nova_quota_security_groups }} +quota_server_group_members = {{ nova_quota_server_group_members }} +quota_server_groups = {{ nova_quota_server_groups }} # Scheduler cpu_allocation_ratio = {{ nova_cpu_allocation_ratio }}