Merge "Fix newton compat mode for deployed server."

This commit is contained in:
Zuul 2018-03-21 11:52:27 +00:00 committed by Gerrit Code Review
commit b8044a36b6
2 changed files with 5 additions and 1 deletions

View File

@ -4,6 +4,9 @@ parameters:
network: network:
type: string type: string
default: ctlplane default: ctlplane
fixed_ips:
default: []
type: json
name: name:
type: string type: string
replacement_policy: replacement_policy:

View File

@ -129,7 +129,8 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
'NovaComputeExtraConfig': ['description'], 'NovaComputeExtraConfig': ['description'],
'controllerExtraConfig': ['description'], 'controllerExtraConfig': ['description'],
'DockerSwiftConfigImage': ['default'], 'DockerSwiftConfigImage': ['default'],
'input_values': ['default'] 'input_values': ['default'],
'fixed_ips': ['default', 'type']
} }
PREFERRED_CAMEL_CASE = { PREFERRED_CAMEL_CASE = {