Merge "Stop using puppet to configure VIPs in /etc/hosts"

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

diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml
index 6109002..318eca8 100644 (file)
--- a/net-config-bridge.yaml
+++ b/net-config-bridge.yaml
@@ -3,6 +3,36 @@ heat_template_version: 2015-04-30
 description: >
   Software Config to drive os-net-config for a simple bridge.
 
+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
@@ -15,14 +45,6 @@ resources:
               type: ovs_bridge
               name: {get_input: bridge_name}
               use_dhcp: true
-              # Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284
-              #ovs_extra:
-              #  - list_join:
-              #    - ' '
-              #    - - br-set-external-id
-              #      - {get_input: bridge_name}
-              #      - bridge-id
-              #      - {get_input: bridge_name}
               members:
                 -
                   type: interface
@@ -31,7 +53,6 @@ resources:
                   primary: true
 
 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}