Merge "Use OS::Heat::Value for NetworkConfig"

openstack-archive · Sep 23, 2020 · b60c712 · b60c712
2 parents bc19953 + a4622f1
commit b60c712
Show file tree

Hide file tree

Showing 41 changed files with 1,663 additions and 2,192 deletions.
diff --git a/ci/common/net-config-multinode.yaml b/ci/common/net-config-multinode.yaml
@@ -182,27 +182,21 @@ parameters:
 
 resources:
   OsNetConfigImpl:
-    type: OS::Heat::SoftwareConfig
+    type: OS::Heat::Value
     properties:
-      group: script
-      config:
-        str_replace:
-          template:
-            get_file: ../../network/scripts/run-os-net-config.sh
-          params:
-            $network_config:
-              network_config:
-              - type: ovs_bridge
-                name: br-ex
-                use_dhcp: false
-                addresses:
-                - ip_netmask:
-                    list_join:
-                    - /
-                    - - get_param: ControlPlaneIp
-                      - get_param: ControlPlaneSubnetCidr
+      value:
+        network_config:
+        - type: ovs_bridge
+          name: br-ex
+          use_dhcp: false
+          addresses:
+          - ip_netmask:
+              list_join:
+              - /
+              - - get_param: ControlPlaneIp
+                - get_param: ControlPlaneSubnetCidr
 
 outputs:
-  OS::stack_id:
+  config:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value: {get_attr: [OsNetConfigImpl, value]}
diff --git a/ci/common/net-config-simple-bridge.yaml b/ci/common/net-config-simple-bridge.yaml
@@ -179,30 +179,24 @@ parameters:
 
 resources:
   OsNetConfigImpl:
-    type: OS::Heat::SoftwareConfig
+    type: OS::Heat::Value
     properties:
-      group: script
-      config:
-        str_replace:
-          template:
-            get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
-          params:
-            $network_config:
-              network_config:
-              - type: ovs_bridge
-                name: br-ctlplane
-                use_dhcp: false
-                ovs_extra:
-                  - "br-set-external-id br-ctlplane bridge-id br-ctlplane"
-                addresses:
-                - ip_netmask:
-                    list_join:
-                    - /
-                    - - get_param: ControlPlaneIp
-                      - get_param: ControlPlaneSubnetCidr
+      value:
+        network_config:
+        - type: ovs_bridge
+          name: br-ctlplane
+          use_dhcp: false
+          ovs_extra:
+            - "br-set-external-id br-ctlplane bridge-id br-ctlplane"
+          addresses:
+          - ip_netmask:
+              list_join:
+              - /
+              - - get_param: ControlPlaneIp
+                - get_param: ControlPlaneSubnetCidr
 
 outputs:
-  OS::stack_id:
+  config:
     description: The OsNetConfigImpl resource.
     value:
-      get_resource: OsNetConfigImpl
+      get_attr: [OsNetConfigImpl, value]
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml
@@ -89,44 +89,38 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::Value
     properties:
-      config:
-        str_replace:
-          params:
-            $network_config:
-              network_config:
-              - type: interface
-                name: nic1
-                mtu: 1350
-                use_dhcp: false
-                addresses:
-                - ip_netmask:
-                    list_join:
-                    - /
-                    - - {get_param: ControlPlaneIp}
-                      - {get_param: ControlPlaneSubnetCidr}
-                routes:
-                - default: true
-                  ip_netmask: 0.0.0.0/0
-                  next_hop: {get_param: ControlPlaneDefaultRoute}
-              - type: interface
-                name: nic4
-                mtu: 1350
-                use_dhcp: false
-                addresses:
-                - ip_netmask: {get_param: StorageIpSubnet}
-              - type: interface
-                name: nic5
-                mtu: 1350
-                use_dhcp: false
-                addresses:
-                - ip_netmask: {get_param: StorageMgmtIpSubnet}
-          template:
-            get_file: ../../../../../network/scripts/run-os-net-config.sh
-      group: script
-    type: OS::Heat::SoftwareConfig
+      value:
+        network_config:
+        - type: interface
+          name: nic1
+          mtu: 1350
+          use_dhcp: false
+          addresses:
+          - ip_netmask:
+              list_join:
+              - /
+              - - {get_param: ControlPlaneIp}
+                - {get_param: ControlPlaneSubnetCidr}
+          routes:
+          - default: true
+            ip_netmask: 0.0.0.0/0
+            next_hop: {get_param: ControlPlaneDefaultRoute}
+        - type: interface
+          name: nic4
+          mtu: 1350
+          use_dhcp: false
+          addresses:
+          - ip_netmask: {get_param: StorageIpSubnet}
+        - type: interface
+          name: nic5
+          mtu: 1350
+          use_dhcp: false
+          addresses:
+          - ip_netmask: {get_param: StorageMgmtIpSubnet}
 
 outputs:
-  OS::stack_id:
+  config:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value: {get_attr: [OsNetConfigImpl, value]}
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml
@@ -111,18 +111,12 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::Value
     properties:
-      config:
-        str_replace:
-          params:
-            $network_config:
-              network_config: []
-          template:
-            get_file: ../../../../../network/scripts/run-os-net-config.sh
-      group: script
-    type: OS::Heat::SoftwareConfig
+      value:
+        network_config: []
 
 outputs:
-  OS::stack_id:
+  config:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value: {get_attr: [OsNetConfigImpl, value]}
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml
@@ -120,68 +120,62 @@ parameters:
 
 resources:
   OsNetConfigImpl:
+    type: OS::Heat::Value
     properties:
-      config:
-        str_replace:
-          params:
-            $network_config:
-              network_config:
-              - type: interface
-                name: nic1
-                mtu: 1350
-                use_dhcp: false
-                addresses:
-                - ip_netmask:
-                    list_join:
-                    - /
-                    - - {get_param: ControlPlaneIp}
-                      - {get_param: ControlPlaneSubnetCidr}
-                routes:
-                - default: true
-                  ip_netmask: 0.0.0.0/0
-                  next_hop: {get_param: ControlPlaneDefaultRoute}
-              - type: interface
-                name: nic3
-                mtu: 1350
-                use_dhcp: false
-                addresses:
-                - ip_netmask: {get_param: InternalApiIpSubnet}
-              - type: interface
-                name: nic4
-                mtu: 1350
-                use_dhcp: false
-                addresses:
-                - ip_netmask: {get_param: StorageIpSubnet}
-              - type: ovs_bridge
-                name: br-tenant
-                dns_servers: {get_param: DnsServers}
-                domain: {get_param: DnsSearchDomains}
-                use_dhcp: false
-                addresses:
-                - ip_netmask: {get_param: TenantIpSubnet}
-                members:
-                - type: interface
-                  name: nic6
-                  mtu: 1350
-                  primary: true
-              - type: ovs_bridge
-                name: br-ex
-                dns_servers: {get_param: DnsServers}
-                use_dhcp: false
-                routes:
-                - ip_netmask: ::/0
-                  next_hop: {get_param: ExternalInterfaceDefaultRoute}
-                members:
-                - type: interface
-                  name: nic2
-                  mtu: 1350
-                  primary: true
-          template:
-            get_file: ../../../../../network/scripts/run-os-net-config.sh
-      group: script
-    type: OS::Heat::SoftwareConfig
+      value:
+        network_config:
+        - type: interface
+          name: nic1
+          mtu: 1350
+          use_dhcp: false
+          addresses:
+          - ip_netmask:
+              list_join:
+              - /
+              - - {get_param: ControlPlaneIp}
+                - {get_param: ControlPlaneSubnetCidr}
+          routes:
+          - default: true
+            ip_netmask: 0.0.0.0/0
+            next_hop: {get_param: ControlPlaneDefaultRoute}
+        - type: interface
+          name: nic3
+          mtu: 1350
+          use_dhcp: false
+          addresses:
+          - ip_netmask: {get_param: InternalApiIpSubnet}
+        - type: interface
+          name: nic4
+          mtu: 1350
+          use_dhcp: false
+          addresses:
+          - ip_netmask: {get_param: StorageIpSubnet}
+        - type: ovs_bridge
+          name: br-tenant
+          dns_servers: {get_param: DnsServers}
+          domain: {get_param: DnsSearchDomains}
+          use_dhcp: false
+          addresses:
+          - ip_netmask: {get_param: TenantIpSubnet}
+          members:
+          - type: interface
+            name: nic6
+            mtu: 1350
+            primary: true
+        - type: ovs_bridge
+          name: br-ex
+          dns_servers: {get_param: DnsServers}
+          use_dhcp: false
+          routes:
+          - ip_netmask: ::/0
+            next_hop: {get_param: ExternalInterfaceDefaultRoute}
+          members:
+          - type: interface
+            name: nic2
+            mtu: 1350
+            primary: true
 
 outputs:
-  OS::stack_id:
+  config:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value: {get_attr: [OsNetConfigImpl, value]}