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 c3416e0..318eca8 100644 (file)
--- a/net-config-bridge.yaml
+++ b/net-config-bridge.yaml
@@ -4,6 +4,10 @@ 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
@@ -24,6 +28,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:
@@ -37,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