openstack/puppet-nova
Code Issues Proposed changes

Change scheduler configurations to use entrypoints

Browse Source 
Update defaults values for scheduler_driver and scheduler_host_manager
to match with upstream values in Nova.

It was configured in Devstack:
b298e57c9f

And old values don't work anymore since:
7f1ff4b226

Change-Id: Idbbae5281d429edb95783cdde3d45804ddaeace1
Closes-Bug: #1572467
This commit is contained in:
Emilien Macchi 2016-04-20 12:22:03 -04:00
parent 48815a3bb2
commit 6bffa3a961
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/scheduler.pp
View File

@ -18,13 +18,13 @@
# #
# [*scheduler_driver*] # [*scheduler_driver*]
# (optional) Default driver to use for the scheduler # (optional) Default driver to use for the scheduler
# Defaults to 'nova.scheduler.filter_scheduler.FilterScheduler' # Defaults to 'filter_scheduler'
# #
class nova::scheduler( class nova::scheduler(
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$ensure_package = 'present', $ensure_package = 'present',
$scheduler_driver = 'nova.scheduler.filter_scheduler.FilterScheduler', $scheduler_driver = 'filter_scheduler',
) { ) {
include ::nova::deps include ::nova::deps

4
manifests/scheduler/filter.pp
View File

@ -6,7 +6,7 @@
# #
# [*scheduler_host_manager*] # [*scheduler_host_manager*]
# (optional) The scheduler host manager class to use # (optional) The scheduler host manager class to use
# Defaults to 'nova.scheduler.host_manager.HostManager' # Defaults to 'host_manager'
# #
# [*scheduler_max_attempts*] # [*scheduler_max_attempts*]
# (optional) Maximum number of attempts to schedule an instance # (optional) Maximum number of attempts to schedule an instance
@ -65,7 +65,7 @@
# Defaults to false # Defaults to false
# #
class nova::scheduler::filter ( class nova::scheduler::filter (
$scheduler_host_manager = 'nova.scheduler.host_manager.HostManager', $scheduler_host_manager = 'host_manager',
$scheduler_max_attempts = '3', $scheduler_max_attempts = '3',
$scheduler_host_subset_size = '1', $scheduler_host_subset_size = '1',
$cpu_allocation_ratio = '16.0', $cpu_allocation_ratio = '16.0',

4
releasenotes/notes/scheduler_entrypoints-467a5083d8f65e3d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- Change default values for scheduler_driver and scheduler_host_manager to match
defaults values in Nova, so now we use entrypoints.

2
spec/classes/nova_scheduler_filter_spec.rb
View File

@ -2,7 +2,7 @@ require 'spec_helper'
describe 'nova::scheduler::filter' do describe 'nova::scheduler::filter' do
it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_manager').with_value('nova.scheduler.host_manager.HostManager') } it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_manager').with_value('host_manager') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_max_attempts').with_value('3') } it { is_expected.to contain_nova_config('DEFAULT/scheduler_max_attempts').with_value('3') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_subset_size').with_value('1') } it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_subset_size').with_value('1') }
it { is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with_value('16.0') } it { is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with_value('16.0') }

2
spec/classes/nova_scheduler_spec.rb
View File

@ -20,7 +20,7 @@ describe 'nova::scheduler' do
:ensure => 'running' :ensure => 'running'
)} )}
it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_value('nova.scheduler.filter_scheduler.FilterScheduler') } it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_value('filter_scheduler') }
context 'with manage_service as false' do context 'with manage_service as false' do
let :params do let :params do