openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make UpgradeLevelNovaCompute parameters consistent"

This commit is contained in:
Jenkins 2017-08-03 21:53:09 +00:00 committed by Gerrit Code Review
parent 45c95100cf 7f84409a6a
commit 1ea7c35f4f
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/services/nova-compute.yaml
View File

@ -97,7 +97,7 @@ parameters:
UpgradeLevelNovaCompute: UpgradeLevelNovaCompute:
type: string type: string
description: Nova Compute upgrade level description: Nova Compute upgrade level
default: auto default: ''
MigrationSshKey: MigrationSshKey:
type: json type: json
description: > description: >

2
puppet/services/nova-conductor.yaml
View File

@ -45,7 +45,7 @@ parameters:
UpgradeLevelNovaCompute: UpgradeLevelNovaCompute:
type: string type: string
description: Nova Compute upgrade level description: Nova Compute upgrade level
default: auto default: ''
conditions: conditions:
nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]} nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}

1
tools/yaml-validate.py
View File

@ -75,7 +75,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'NeutronBigswitchLLDPEnabled': ['default'], 'NeutronBigswitchLLDPEnabled': ['default'],
'NeutronWorkers': ['description'], 'NeutronWorkers': ['description'],
'ServerMetadata': ['description'], 'ServerMetadata': ['description'],
'UpgradeLevelNovaCompute': ['default'],
'server': ['description'], 'server': ['description'],
'servers': ['description'], 'servers': ['description'],
'ExtraConfig': ['description'], 'ExtraConfig': ['description'],