From 941f144d22b94d711d5deb82f8ce721bb4d72304 Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Wed, 14 Mar 2018 16:13:21 +0100
Subject: [PATCH] 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 5015cc6dd8763826901fae65dfb737c4909adaea)
---
 deployed-server/ctlplane-port.yaml | 3 +++
 tools/yaml-validate.py             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/deployed-server/ctlplane-port.yaml b/deployed-server/ctlplane-port.yaml
index 924ff1b496..8cda15a11f 100644
--- a/deployed-server/ctlplane-port.yaml
+++ b/deployed-server/ctlplane-port.yaml
@@ -4,6 +4,9 @@ parameters:
   network:
     type: string
     default: ctlplane
+  fixed_ips:
+    default: []
+    type: json
   name:
     type: string
   replacement_policy:
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index d7d0d87af2..a40fdd020c 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -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 = {