X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-static-bridge-with-external-dhcp.yaml;h=cbf282eab218332a75be93f583ec8806da4cbfc5;hb=6f9f76748c93d88b0f72488a4b841401df3f54b7;hp=6dbe598206c1df436e11e6594c56086b65500e01;hpb=03732f871ba237ec02f43537cecf8ca802d66210;p=apex-tripleo-heat-templates.git

diff --git a/net-config-static-bridge-with-external-dhcp.yaml b/net-config-static-bridge-with-external-dhcp.yaml
index 6dbe5982..cbf282ea 100644
--- a/net-config-static-bridge-with-external-dhcp.yaml
+++ b/net-config-static-bridge-with-external-dhcp.yaml
@@ -1,9 +1,6 @@
-heat_template_version: 2015-04-30
-
+heat_template_version: pike
 description: >
-  Software Config to drive os-net-config for a simple bridge configured
-  with a static IP address for the ctlplane network.
-
+  Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network.
 parameters:
   ControlPlaneIp:
     default: ''
@@ -47,53 +44,44 @@ parameters:
   EC2MetadataIp: # Override this via parameter_defaults
     description: The IP address of the EC2 metadata server.
     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
-              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
-            -
-              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:
-                -
-                  ip_netmask:
+              - type: interface
+                name: br-ex:0
+                addresses:
+                - ip_netmask:
                     list_join:
-                      - '/'
-                      - - {get_param: ControlPlaneIp}
-                        - {get_param: ControlPlaneSubnetCidr}
-              routes:
-                -
-                  ip_netmask: 169.254.169.254/32
-                  next_hop: {get_param: EC2MetadataIp}
-                -
-                  default: true
-                  next_hop: {get_param: ControlPlaneDefaultRoute}
-
+                    - /
+                    - - get_param: ControlPlaneIp
+                      - get_param: ControlPlaneSubnetCidr
+                routes:
+                - ip_netmask: 169.254.169.254/32
+                  next_hop:
+                    get_param: EC2MetadataIp
+                - default: true
+                  next_hop:
+                    get_param: ControlPlaneDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value:
+      get_resource: OsNetConfigImpl
+