X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-linux-bridge.yaml;h=04664818baa66c5780e9b7fd5468bcb53bd00c4b;hb=08c6a8617d200de786549b4f0649228e088f3ada;hp=0646ffab3d050f6d5fa887e8e74ff849a7129659;hpb=4d59bbb55eae146d78c44282151d3d15eeded240;p=apex-tripleo-heat-templates.git

diff --git a/net-config-linux-bridge.yaml b/net-config-linux-bridge.yaml
index 0646ffab..04664818 100644
--- a/net-config-linux-bridge.yaml
+++ b/net-config-linux-bridge.yaml
@@ -1,8 +1,6 @@
-heat_template_version: 2015-04-30
-
+heat_template_version: ocata
 description: >
   Software Config to drive os-net-config for a simple bridge.
-
 parameters:
   ControlPlaneIp:
     default: ''
@@ -28,46 +26,52 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  ManagementIpSubnet:
+    default: ''
+    description: IP address/subnet on the management network
+    type: string
   ControlPlaneDefaultRoute: # Override this via parameter_defaults
     description: The default route of the control plane network.
     type: string
-    default: '192.0.2.1'
+    default: 192.0.2.1
   EC2MetadataIp: # Override this via parameter_defaults
     description: The IP address of the EC2 metadata server.
     type: string
-    default: '169.254.169.254/32'
-
-
+    default: 169.254.169.254/32
 resources:
   OsNetConfigImpl:
-    type: OS::Heat::StructuredConfig
+    type: OS::Heat::SoftwareConfig
     properties:
-      group: os-apply-config
+      group: script
       config:
-        os_net_config:
-          network_config:
-            -
-              type: linux_bridge
-              name: {get_input: bridge_name}
-              addresses:
-                -
-                  ip_netmask: {get_param: ControlPlaneIp}
-              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: linux_bridge
+                name: bridge_name
+                addresses:
+                - ip_netmask:
+                    get_param: ControlPlaneIp
+                members:
+                - type: interface
+                  name: interface_name
                   # force the MAC address of the bridge to this interface
                   primary: true
-              routes:
-                -
-                  ip_netmask: 0.0.0.0/0
-                  next_hop: {get_param: ControlPlaneDefaultRoute}
+                routes:
+                - ip_netmask: 0.0.0.0/0
+                  next_hop:
+                    get_param: ControlPlaneDefaultRoute
                   default: true
-                -
-                  ip_netmask: {get_param: EC2MetadataIp}
-                  next_hop: {get_param: ControlPlaneDefaultRoute}
-
+                - ip_netmask:
+                    get_param: EC2MetadataIp
+                  next_hop:
+                    get_param: ControlPlaneDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value:
+      get_resource: OsNetConfigImpl
+