From 8f593e92a65aabb713be805fef80bf36df3e50f3 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 --- playbooks/roles/os_cinder/defaults/main.yml | 8 ++++++++ .../roles/os_cinder/templates/cinder.conf.j2 | 8 ++++++++ playbooks/roles/os_neutron/defaults/main.yml | 16 ++++++++++++++++ .../roles/os_neutron/templates/neutron.conf.j2 | 14 ++++++++++++++ playbooks/roles/os_nova/defaults/main.yml | 12 ++++++++++++ playbooks/roles/os_nova/templates/nova.conf.j2 | 12 ++++++++++++ 6 files changed, 70 insertions(+) diff --git a/playbooks/roles/os_cinder/defaults/main.yml b/playbooks/roles/os_cinder/defaults/main.yml index 5e211b04d6..c46d977b4b 100644 --- a/playbooks/roles/os_cinder/defaults/main.yml +++ b/playbooks/roles/os_cinder/defaults/main.yml @@ -146,6 +146,14 @@ cinder_profiler_trace_sqlalchemy: false cinder_client_socket_timeout: 900 +## Cinder quota +cinder_quota_volumes: 10 +cinder_quota_snapshots: 10 +cinder_quota_consistencygroups: 10 +cinder_quota_gigabytes: 1000 +cinder_quota_backups: 10 +cinder_quota_backup_gigabytes: 1000 + ## General configuration ## Set this in rpc_user_config.yml UNLESS you want all hosts to use the same ## Cinder backends. See the rpc_user_config example for more on how this is done. diff --git a/playbooks/roles/os_cinder/templates/cinder.conf.j2 b/playbooks/roles/os_cinder/templates/cinder.conf.j2 index b313f5b7d7..0e59d17ebb 100644 --- a/playbooks/roles/os_cinder/templates/cinder.conf.j2 +++ b/playbooks/roles/os_cinder/templates/cinder.conf.j2 @@ -45,6 +45,14 @@ backup_metadata_version = {{ cinder_service_backup_metadata_version }} ## RabbitMQ rpc_backend = {{ cinder_rpc_backend }} +## Quota +quota_volumes = {{ cinder_quota_volumes }} +quota_snapshots = {{ cinder_quota_snapshots }} +quota_consistencygroups = {{ cinder_quota_consistencygroups }} +quota_gigabytes = {{ cinder_quota_gigabytes }} +quota_backups = {{ cinder_quota_backups }} +quota_backup_gigabytes = {{ cinder_quota_backup_gigabytes }} + ## Nova nova_catalog_info = {{ cinder_nova_catalog_info }} nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }} diff --git a/playbooks/roles/os_neutron/defaults/main.yml b/playbooks/roles/os_neutron/defaults/main.yml index f6bd904faf..eac6efa753 100644 --- a/playbooks/roles/os_neutron/defaults/main.yml +++ b/playbooks/roles/os_neutron/defaults/main.yml @@ -63,6 +63,22 @@ neutron_driver_notification: neutron.openstack.common.notifier.rpc_notifier neutron_driver_quota: neutron.db.quota_db.DbQuotaDriver neutron_driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver +## Quotas +neutron_default_quota: -1 +neutron_quota_floatingip: 50 +neutron_quota_health_monitor: -1 +neutron_quota_member: -1 +neutron_quota_network: 10 +neutron_quota_network_gateway: 5 +neutron_quota_packet_filter: 100 +neutron_quota_pool: 10 +neutron_quota_port: 50 +neutron_quota_router: 10 +neutron_quota_security_group: 10 +neutron_quota_security_group_rule: 100 +neutron_quota_subnet: 10 +neutron_quota_vip: 10 + ## General Neutron configuration # If ``neutron_api_workers`` is unset the system will use half the number of available VCPUs to # compute the number of api workers to use. diff --git a/playbooks/roles/os_neutron/templates/neutron.conf.j2 b/playbooks/roles/os_neutron/templates/neutron.conf.j2 index af03743bbf..716a0250db 100644 --- a/playbooks/roles/os_neutron/templates/neutron.conf.j2 +++ b/playbooks/roles/os_neutron/templates/neutron.conf.j2 @@ -85,6 +85,20 @@ password = {{ nova_service_password }} [quotas] quota_driver = {{ neutron_driver_quota }} quota_items = network,subnet,port +default_quota = {{ neutron_default_quota }} +quota_floatingip = {{ neutron_quota_floatingip }} +quota_health_monitor = {{ neutron_quota_health_monitor }} +quota_member = {{ neutron_quota_member }} +quota_network = {{ neutron_quota_network }} +quota_network_gateway = {{ neutron_quota_network_gateway }} +quota_packet_filter = {{ neutron_quota_packet_filter }} +quota_pool = {{ neutron_quota_pool }} +quota_port = {{ neutron_quota_port }} +quota_router = {{ neutron_quota_router }} +quota_security_group = {{ neutron_quota_security_group }} +quota_security_group_rule = {{ neutron_quota_security_group_rule }} +quota_subnet = {{ neutron_quota_subnet }} +quota_vip = {{ neutron_quota_vip }} [agent] diff --git a/playbooks/roles/os_nova/defaults/main.yml b/playbooks/roles/os_nova/defaults/main.yml index 6a6a28aa76..d496d77ce6 100644 --- a/playbooks/roles/os_nova/defaults/main.yml +++ b/playbooks/roles/os_nova/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/playbooks/roles/os_nova/templates/nova.conf.j2 b/playbooks/roles/os_nova/templates/nova.conf.j2 index f31d0e7de1..d81b73a57d 100644 --- a/playbooks/roles/os_nova/templates/nova.conf.j2 +++ b/playbooks/roles/os_nova/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 }}