Merge "Fix newton compat mode for deployed server."

2018-03-21 11:52:27 +00:00 · 2018-03-21 11:52:27 +00:00 · b8044a36b6
commit b8044a36b6
parent e4af98144c 5015cc6dd8
2 changed files with 5 additions and 1 deletions
--- 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:
--- 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 = {