Merge "Use static environment for deployed-server neutron mappings"

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

diff --git a/net-config-noop.yaml b/net-config-noop.yaml
index 35cfecc..57f1a19 100644 (file)
--- a/net-config-noop.yaml
+++ b/net-config-noop.yaml
@@ -1,18 +1,47 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 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
+    type: string
+  InternalApiIpSubnet:
+    default: ''
+    description: IP address/subnet on the internal API network
+    type: string
+  StorageIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage network
+    type: string
+  StorageMgmtIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage mgmt network
+    type: string
+  TenantIpSubnet:
+    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:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
-      config:
+      group: apply-config
+      config: {}
 
 outputs:
-  config_id:
-    description: The ID of the OsNetConfigImpl resource.
-    value:
-      {get_resource: OsNetConfigImpl}
+  OS::stack_id:
+    description: The OsNetConfigImpl resource.
+    value: {get_resource: OsNetConfigImpl}