38f98383d3
This patch updates the t-h-t templates for nova services so that we only set the value of workers in the non-default case. TripleO has always defaulted the workers count to 0 and there was recently a regression in nova where they treat the default of 0 as invalid (a bug that may get fixed in nova but we don't want to wait on it) This patch avoids the issue by allowing the default value to be unset if the TripleO default of 0 is configured. Change-Id: I175977b88129d87caeb32332d47eb14816a6d5d4 Closes-bug: #1631133
64 lines
1.8 KiB
YAML
64 lines
1.8 KiB
YAML
heat_template_version: 2016-10-14
|
|
|
|
description: >
|
|
OpenStack Nova Conductor service configured with Puppet
|
|
|
|
parameters:
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
NovaWorkers:
|
|
default: 0
|
|
description: Number of workers for Nova Conductor service.
|
|
type: number
|
|
MonitoringSubscriptionNovaConductor:
|
|
default: 'overcloud-nova-conductor'
|
|
type: string
|
|
NovaSchedulerLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.nova.scheduler
|
|
path: /var/log/nova/nova-scheduler.log
|
|
|
|
conditions:
|
|
nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
|
|
|
|
resources:
|
|
NovaBase:
|
|
type: ./nova-base.yaml
|
|
properties:
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Nova Conductor service.
|
|
value:
|
|
service_name: nova_conductor
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaConductor}
|
|
logging_source: {get_param: NovaSchedulerLoggingSource}
|
|
logging_groups:
|
|
- nova
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NovaBase, role_data, config_settings]
|
|
-
|
|
if:
|
|
- nova_workers_zero
|
|
- {}
|
|
- nova::conductor::workers: {get_param: NovaWorkers}
|
|
step_config: |
|
|
include tripleo::profile::base::nova::conductor
|