Add NovaSchedulerMaxAttempts parameter

Needed by the Undercloud installer. Defaults to 3 to match
what we do in puppet-tripleo today for the Overcloud.

Change-Id: Ib4ea5af26c39e466d0f4b7506a65f020620f2120
This commit is contained in:
Dan Prince 2017-12-07 22:22:44 -05:00
parent 20a5994716
commit 1ad70e7899
2 changed files with 10 additions and 0 deletions

View File

@ -15,6 +15,7 @@ parameter_defaults:
NeutronDnsDomain: '' NeutronDnsDomain: ''
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters' NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter'] NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
NovaSchedulerMaxAttempts: 30
NeutronDhcpAgentsPerNetwork: 2 NeutronDhcpAgentsPerNetwork: 2
HeatConvergenceEngine: false HeatConvergenceEngine: false
HeatMaxResourcesPerStack: -1 HeatMaxResourcesPerStack: -1

View File

@ -41,6 +41,14 @@ parameters:
An array of filters used by Nova to filter a node.These filters will be An array of filters used by Nova to filter a node.These filters will be
applied in the order they are listed, so place your most restrictive applied in the order they are listed, so place your most restrictive
filters first to make the filtering process more efficient. filters first to make the filtering process more efficient.
NovaSchedulerMaxAttempts:
type: number
default: 3
description: >
Maximum number of attempts the scheduler will make when deploying the
instance. You should keep it greater or equal to the number of bare
metal nodes you expect to deploy at once to work around potential race
conditions when scheduling.
MonitoringSubscriptionNovaScheduler: MonitoringSubscriptionNovaScheduler:
default: 'overcloud-nova-scheduler' default: 'overcloud-nova-scheduler'
type: string type: string
@ -84,6 +92,7 @@ outputs:
- nova::ram_allocation_ratio: '1.0' - nova::ram_allocation_ratio: '1.0'
nova::scheduler::filter::scheduler_available_filters: {get_param: NovaSchedulerAvailableFilters} nova::scheduler::filter::scheduler_available_filters: {get_param: NovaSchedulerAvailableFilters}
nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters} nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters}
nova::scheduler::filter::scheduler_max_attempts: {get_param: NovaSchedulerMaxAttempts}
nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval} nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval}
step_config: | step_config: |
include tripleo::profile::base::nova::scheduler include tripleo::profile::base::nova::scheduler