Merge "Import TripleO CI environments from tripleo-ci"

[apex-tripleo-heat-templates.git] / net-config-static-bridge-with-external-dhcp.yaml

diff --git a/net-config-static-bridge-with-external-dhcp.yaml b/net-config-static-bridge-with-external-dhcp.yaml
index 6dbe598..3ea4e6a 100644 (file)
--- a/net-config-static-bridge-with-external-dhcp.yaml
+++ b/net-config-static-bridge-with-external-dhcp.yaml
@@ -68,15 +68,6 @@ resources:
                   primary: true
             -
               type: interface
-              # would like to do the following, but can't b/c of:
-              # https://bugs.launchpad.net/heat/+bug/1344284
-              # name:
-              # list_join:
-              #   - '/'
-              #   - - {get_input: bridge_name}
-              #   - ':0'
-              # So, just hardcode to br-ex:0 for now, br-ex is hardcoded in
-              # controller.yaml anyway.
               name: br-ex:0
               addresses:
                 -