7f84409a6a
There is logic in nova-base.yaml that depends on the default for this parameter being '', and the nova-compute service only needs it set to auto during upgrade. That will be done by [1] anyway, so it doesn't matter what the default is. It's also not clear to me that the nova-compute task is even needed now that we're post-Ocata, but that's not a change I feel comfortable making. 1: https://github.com/openstack/tripleo-heat-templates/blob/master/environments/major-upgrade-composable-steps.yaml Change-Id: Iccfcb5b68e406db1b942375803cfedbb929b4307 Partial-Bug: 1700664
96 lines
2.9 KiB
YAML
96 lines
2.9 KiB
YAML
heat_template_version: pike
|
|
|
|
description: >
|
|
OpenStack Nova Conductor service configured with Puppet
|
|
|
|
parameters:
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
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
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
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 services.
|
|
type: number
|
|
MonitoringSubscriptionNovaConductor:
|
|
default: 'overcloud-nova-conductor'
|
|
type: string
|
|
NovaSchedulerLoggingSource:
|
|
type: json
|
|
default:
|
|
tag: openstack.nova.scheduler
|
|
path: /var/log/nova/nova-scheduler.log
|
|
UpgradeLevelNovaCompute:
|
|
type: string
|
|
description: Nova Compute upgrade level
|
|
default: ''
|
|
|
|
conditions:
|
|
nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
|
|
|
|
resources:
|
|
NovaBase:
|
|
type: ./nova-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
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
|
|
upgrade_tasks:
|
|
- name: Stop nova_conductor service
|
|
tags: step1
|
|
service: name=openstack-nova-conductor state=stopped
|
|
# If not already set by puppet (e.g a pre-ocata version), set the
|
|
# upgrade_level for compute to "auto"
|
|
- name: Set compute upgrade level to auto
|
|
tags: step1
|
|
ini_file:
|
|
str_replace:
|
|
template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
|
|
params:
|
|
LEVEL: {get_param: UpgradeLevelNovaCompute}
|