From eff09d6554b9703ccc91d15e5b09eaae74614ac8 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 24 Sep 2014 00:09:03 -0500 Subject: [PATCH 1/3] added sane scheduler settings --- .../inventory/group_vars/nova_all.yml | 20 +++++++++++++++++++ .../roles/nova_common/templates/nova.conf | 20 ++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/rpc_deployment/inventory/group_vars/nova_all.yml b/rpc_deployment/inventory/group_vars/nova_all.yml index a65fa90200..585044195c 100644 --- a/rpc_deployment/inventory/group_vars/nova_all.yml +++ b/rpc_deployment/inventory/group_vars/nova_all.yml @@ -67,6 +67,26 @@ nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver nova_compute_driver: libvirt.LibvirtDriver nova_max_age: 0 +# Nova Scheduler +nova_cpu_allocation_ratio: 10.0 +nova_disk_allocation_ratio: 1.0 +nova_max_instances_per_host: 50 +nova_max_io_ops_per_host: 10 +nova_ram_allocation_ratio: 1.5 +nova_ram_weight_multiplier: 5.0 +nova_reserved_host_disk_mb: 1024 +nova_reserved_host_memory_mb: 512 +nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler +nova_scheduler_available_filters: nova.scheduler.filters.all_filters +nova_scheduler_default_filters: RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter +nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler +nova_scheduler_driver_task_period: 60 +nova_scheduler_host_manager: nova.scheduler.host_manager.HostManager +nova_scheduler_host_subset_size: 10 +nova_scheduler_manager: nova.scheduler.manager.SchedulerManager +nova_scheduler_max_attempts: 5 +nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers + ## Git Source ## ALL of this has been relocated to vars/repo_packages ## TODO(someone) this should be removed once the repo bits are all figured out. diff --git a/rpc_deployment/roles/nova_common/templates/nova.conf b/rpc_deployment/roles/nova_common/templates/nova.conf index e8b226ae88..332d6b8b75 100644 --- a/rpc_deployment/roles/nova_common/templates/nova.conf +++ b/rpc_deployment/roles/nova_common/templates/nova.conf @@ -6,9 +6,27 @@ log_dir = /var/log/nova state_path = /var/lib/nova lock_path = /var/lock/nova rootwrap_config = /etc/nova/rootwrap.conf +service_down_time = 120 # Scheduler -scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler +cpu_allocation_ratio = {{ nova_cpu_allocation_ratio }} +disk_allocation_ratio = {{ nova_disk_allocation_ratio }} +max_instances_per_host = {{ nova_max_instances_per_host }} +max_io_ops_per_host = {{ nova_max_io_ops_per_host }} +ram_allocation_ratio = {{ nova_ram_allocation_ratio }} +ram_weight_multiplier = {{ nova_ram_weight_multiplier }} +reserved_host_disk_mb = {{ nova_reserved_host_disk_mb }} +reserved_host_memory_mb = {{ nova_reserved_host_memory_mb }} +scheduler_driver = {{ nova_scheduler_driver }} +scheduler_available_filters = {{ nova_scheduler_available_filters }} +scheduler_default_filters = {{ nova_scheduler_default_filters }} +scheduler_driver = {{ nova_scheduler_driver }} +scheduler_driver_task_period = {{ nova_scheduler_driver_task_period }} +scheduler_host_manager = {{ nova_scheduler_host_manager }} +scheduler_host_subset_size = {{ nova_scheduler_host_subset_size }} +scheduler_manager = {{ nova_scheduler_manager }} +scheduler_max_attempts = {{ nova_scheduler_max_attempts }} +scheduler_weight_classes = {{ nova_scheduler_weight_classes }} # Compute compute_driver = {{ nova_compute_driver }} From b786b5d1435519d99fd7ce08e062a897807b236b Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 24 Sep 2014 00:14:50 -0500 Subject: [PATCH 2/3] removed duplicate --- rpc_deployment/inventory/group_vars/nova_all.yml | 1 - rpc_deployment/roles/nova_common/templates/nova.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/rpc_deployment/inventory/group_vars/nova_all.yml b/rpc_deployment/inventory/group_vars/nova_all.yml index 585044195c..2e3d043f1e 100644 --- a/rpc_deployment/inventory/group_vars/nova_all.yml +++ b/rpc_deployment/inventory/group_vars/nova_all.yml @@ -79,7 +79,6 @@ nova_reserved_host_memory_mb: 512 nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler nova_scheduler_available_filters: nova.scheduler.filters.all_filters nova_scheduler_default_filters: RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter -nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler nova_scheduler_driver_task_period: 60 nova_scheduler_host_manager: nova.scheduler.host_manager.HostManager nova_scheduler_host_subset_size: 10 diff --git a/rpc_deployment/roles/nova_common/templates/nova.conf b/rpc_deployment/roles/nova_common/templates/nova.conf index 332d6b8b75..6e867e2a02 100644 --- a/rpc_deployment/roles/nova_common/templates/nova.conf +++ b/rpc_deployment/roles/nova_common/templates/nova.conf @@ -20,7 +20,6 @@ reserved_host_memory_mb = {{ nova_reserved_host_memory_mb }} scheduler_driver = {{ nova_scheduler_driver }} scheduler_available_filters = {{ nova_scheduler_available_filters }} scheduler_default_filters = {{ nova_scheduler_default_filters }} -scheduler_driver = {{ nova_scheduler_driver }} scheduler_driver_task_period = {{ nova_scheduler_driver_task_period }} scheduler_host_manager = {{ nova_scheduler_host_manager }} scheduler_host_subset_size = {{ nova_scheduler_host_subset_size }} From f2e5946e2acc42acc0ecb42604a2b0be8f468ec0 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Sat, 27 Sep 2014 00:07:51 -0500 Subject: [PATCH 3/3] updated defaults --- rpc_deployment/inventory/group_vars/nova_all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpc_deployment/inventory/group_vars/nova_all.yml b/rpc_deployment/inventory/group_vars/nova_all.yml index 2e3d043f1e..56cc8ccbd2 100644 --- a/rpc_deployment/inventory/group_vars/nova_all.yml +++ b/rpc_deployment/inventory/group_vars/nova_all.yml @@ -68,14 +68,14 @@ nova_compute_driver: libvirt.LibvirtDriver nova_max_age: 0 # Nova Scheduler -nova_cpu_allocation_ratio: 10.0 +nova_cpu_allocation_ratio: 5.0 nova_disk_allocation_ratio: 1.0 nova_max_instances_per_host: 50 nova_max_io_ops_per_host: 10 nova_ram_allocation_ratio: 1.5 nova_ram_weight_multiplier: 5.0 -nova_reserved_host_disk_mb: 1024 -nova_reserved_host_memory_mb: 512 +nova_reserved_host_disk_mb: 2048 +nova_reserved_host_memory_mb: 2048 nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler nova_scheduler_available_filters: nova.scheduler.filters.all_filters nova_scheduler_default_filters: RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter