X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-bridge.yaml;h=318eca8af860668bf0d34205d382a1f2fccf27c2;hb=95e443cd1081224cac9ca89846c874d10c6c43da;hp=c3416e0278ee361702652be0da241519d0d439f2;hpb=ebb48a23fb23c6c7ad3701f52b62e6dd8af3b230;p=apex-tripleo-heat-templates.git

diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml
index c3416e02..318eca8a 100644
--- 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