Fix newton compat mode for deployed server.

The ControlPlanePort interface changed in the deployed-server
ressource.  It now takes an additional fixed_ips parameters.

This add the required parameter and is required for FFU testing in CI.

Adjust the validation to take the fixed_ips discrepancies between two
different templates interfaces in deployed-neutron-port and
ctlplane-port.

Change-Id: I58af23129bcba04a367d0169dcafd53d33ab42f2
Closes-Bug: #1755837
(cherry picked from commit 5015cc6dd8)
This commit is contained in:
Sofer Athlan-Guyot 2018-03-14 16:13:21 +01:00 committed by Athlan-Guyot sofer
parent 23f68f0e6a
commit 941f144d22
2 changed files with 5 additions and 1 deletions

View File

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

View File

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