Merge "Adds missing firewall rules for OpenDaylight API service"

[apex-tripleo-heat-templates.git] / net-config-noop.yaml

diff --git a/net-config-noop.yaml b/net-config-noop.yaml
index 3d88dd9..ad580cf 100644 (file)
--- a/net-config-noop.yaml
+++ b/net-config-noop.yaml
@@ -1,10 +1,14 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Software Config to no-op for os-net-config. Using this will allow you
   to use the parameter driven (init-neutron-ovs) configuration instead.
 
 parameters:
+  ControlPlaneIp:
+    default: ''
+    description: IP address/subnet on the ctlplane network
+    type: string
   ExternalIpSubnet:
     default: ''
     description: IP address/subnet on the external network
@@ -25,6 +29,10 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  ManagementIpSubnet:
+    default: ''
+    description: IP address/subnet on the management network
+    type: string
 
 resources:
   OsNetConfigImpl: