Merge "Convert ipv4 nic-config templates"

ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml

@@ -79,9 +79,15 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::SoftwareConfig
     properties:
+      group: script
       config:
-        os_net_config:
+        str_replace:
+          template:
+            get_file: ../../../../../network/scripts/run-os-net-config.sh
+          params:
+            $network_config:
               network_config:
               - type: interface
                 name: nic1
@@ -110,8 +116,6 @@ resources:
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: StorageMgmtIpSubnet}
-      group: os-apply-config
-    type: OS::Heat::StructuredConfig
 
 outputs:
   OS::stack_id:

ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml

@@ -79,12 +79,16 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::SoftwareConfig
     properties:
+      group: script
       config:
-        os_net_config:
+        str_replace:
+          template:
+            get_file: ../../../../../network/scripts/run-os-net-config.sh
+          params:
+            $network_config:
               network_config: []
-      group: os-apply-config
-    type: OS::Heat::StructuredConfig
 
 outputs:
   OS::stack_id:

ci/environments/network/multiple-nics/nic-configs/compute.yaml

@@ -79,9 +79,15 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::SoftwareConfig
     properties:
+      group: script
       config:
-        os_net_config:
+        str_replace:
+          template:
+            get_file: ../../../../../network/scripts/run-os-net-config.sh
+          params:
+            $network_config:
               network_config:
               - type: interface
                 name: nic1
@@ -127,8 +133,6 @@ resources:
                 use_dhcp: false
                 addresses:
                 - ip_netmask: {get_param: StorageMgmtIpSubnet}
-      group: os-apply-config
-    type: OS::Heat::StructuredConfig
 
 outputs:
   OS::stack_id:

ci/environments/network/multiple-nics/nic-configs/controller.yaml

@@ -79,9 +79,15 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::SoftwareConfig
     properties:
+      group: script
       config:
-        os_net_config:
+        str_replace:
+          template:
+            get_file: ../../../../../network/scripts/run-os-net-config.sh
+          params:
+            $network_config:
               network_config:
               - type: interface
                 name: nic1
@@ -139,8 +145,6 @@ resources:
                   name: nic6
                   mtu: 1350
                   primary: true
-      group: os-apply-config
-    type: OS::Heat::StructuredConfig
 
 outputs:
   OS::stack_id:

ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml

@@ -79,12 +79,16 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::SoftwareConfig
     properties:
+      group: script
       config:
-        os_net_config:
+        str_replace:
+          template:
+            get_file: ../../../../../network/scripts/run-os-net-config.sh
+          params:
+            $network_config:
               network_config: []
-      group: os-apply-config
-    type: OS::Heat::StructuredConfig
 
 outputs:
   OS::stack_id: