X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-bridge.yaml;h=10d53880bb44f53156c7a2cc0a0bda17b707b63e;hb=6ebfcd56b7db0d75b9d37566ab9d90a64304bede;hp=d1faa5df95d19e8d6ea20afdd30196a208908ce8;hpb=17e5760f8499c3d4851f308ae66b0b995629e192;p=apex-tripleo-heat-templates.git

diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml
index d1faa5df..10d53880 100644
--- a/net-config-bridge.yaml
+++ b/net-config-bridge.yaml
@@ -1,37 +1,58 @@
-heat_template_version: 2014-10-16
-
+heat_template_version: ocata
 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
+    type: OS::Heat::SoftwareConfig
     properties:
-      group: os-apply-config
+      group: script
       config:
-        os_net_config:
-          network_config:
-            -
-              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
-                  name: {get_input: interface_name}
+        str_replace:
+          template:
+            get_file: network/scripts/run-os-net-config.sh
+          params:
+            $network_config:
+              network_config:
+              - type: ovs_bridge
+                name: bridge_name
+                use_dhcp: true
+                members:
+                - type: interface
+                  name: interface_name
                   # force the MAC address of the bridge to this interface
                   primary: true
-
 outputs:
-  config_id:
-    description: The ID of the OsNetConfigImpl resource.
+  OS::stack_id:
+    description: The OsNetConfigImpl resource.
     value:
-      {get_resource: OsNetConfigImpl}
+      get_resource: OsNetConfigImpl
+