diff --git a/ci/common/net-config-multinode.yaml b/ci/common/net-config-multinode.yaml deleted file mode 100644 index 07b2f19644..0000000000 --- a/ci/common/net-config-multinode.yaml +++ /dev/null @@ -1,202 +0,0 @@ -heat_template_version: rocky - -description: > - Software Config to drive os-net-config for a simple bridge configured - with a static IP address for the ctlplane network. - -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - ExternalIpSubnet: - default: '' - description: IP address/subnet on the external network - type: string - ExternalInterfaceRoutes: - default: [] - description: > - Routes for the external network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ExternalMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - External network. - type: number - ExternalInterfaceDefaultRoute: - default: '' - description: default route for the external network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - StorageMgmt network. - type: number - StorageNFSIpSubnet: - default: '' - description: IP address/subnet on the storage_nfs network - type: string - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Tenant network. - type: number - ManagementIpSubnet: - default: '' - description: IP address/subnet on the management network - type: string - ManagementInterfaceRoutes: - default: [] - description: > - Routes for the management network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ManagementMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Management network. - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - # NOTE(hjensas): We need these because the default network_data.yaml define - # vlan for all networks. - ExternalNetworkVlanID: - default: 10 - description: Vlan ID for the external network traffic. - type: number - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: - - type: ovs_bridge - name: br-ex - use_dhcp: false - addresses: - - ip_netmask: - list_join: - - / - - - get_param: ControlPlaneIp - - get_param: ControlPlaneSubnetCidr - -outputs: - config: - description: The OsNetConfigImpl resource. - value: {get_attr: [OsNetConfigImpl, value]} diff --git a/ci/common/net-config-simple-bridge.yaml b/ci/common/net-config-simple-bridge.yaml deleted file mode 100644 index 89cbf36561..0000000000 --- a/ci/common/net-config-simple-bridge.yaml +++ /dev/null @@ -1,202 +0,0 @@ -heat_template_version: rocky -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 - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - ExternalIpSubnet: - default: '' - description: IP address/subnet on the external network - type: string - ExternalInterfaceRoutes: - default: [] - description: > - Routes for the external network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ExternalMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - External network. - type: number - ExternalInterfaceDefaultRoute: - default: '' - description: default route for the external network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - StorageMgmt network. - type: number - StorageNFSIpSubnet: - default: '' - description: IP address/subnet on the storage_nfs network - type: string - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Tenant network. - type: number - ManagementIpSubnet: - default: '' - description: IP address/subnet on the management network - type: string - ManagementInterfaceRoutes: - default: [] - description: > - Routes for the management network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ManagementMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Management network. - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - # NOTE(hjensas): We need these because the default network_data.yaml define - # vlan for all networks. - ExternalNetworkVlanID: - default: 10 - description: Vlan ID for the external network traffic. - type: number - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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: - config: - description: The OsNetConfigImpl resource. - value: - 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 deleted file mode 100644 index 29be21e951..0000000000 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml +++ /dev/null @@ -1,128 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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: - config: - description: The OsNetConfigImpl resource. - 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 deleted file mode 100644 index 914ebe13ee..0000000000 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml +++ /dev/null @@ -1,119 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: [] -outputs: - config: - description: The OsNetConfigImpl resource. - 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 deleted file mode 100644 index 5d14ab6706..0000000000 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute-dvr.yaml +++ /dev/null @@ -1,181 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Tenant network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list - ExternalInterfaceDefaultRoute: - default: 10.0.0.1 - description: default route for the external network - type: string -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml deleted file mode 100644 index 2f3c41b0b1..0000000000 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml +++ /dev/null @@ -1,163 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Tenant network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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 -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml deleted file mode 100644 index 649b0ed178..0000000000 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml +++ /dev/null @@ -1,232 +0,0 @@ -heat_template_version: rocky -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 - ExternalInterfaceRoutes: - default: [] - description: > - Routes for the external network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Tenant network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - ExternalNetworkVlanID: - default: 10 - description: Vlan ID for the external network traffic. - type: number - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ExternalInterfaceDefaultRoute: - default: 10.0.0.1 - description: default route for the external network - type: string - ExternalMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the External network. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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: ovs_bridge - name: br-ex - dns_servers: - get_param: DnsServers - domain: - get_param: DnsSearchDomains - use_dhcp: false - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - routes: - - default: true - ip_netmask: ::/0 - next_hop: - get_param: ExternalInterfaceDefaultRoute - members: - - type: interface - name: nic2 - mtu: 1350 - primary: true - - 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: interface - name: nic5 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: - get_param: StorageMgmtIpSubnet - - type: ovs_bridge - name: br-tenant - dns_servers: - get_param: DnsServers - use_dhcp: false - addresses: - - ip_netmask: - get_param: TenantIpSubnet - members: - - type: interface - name: nic6 - mtu: 1350 - primary: true -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml deleted file mode 100644 index 914ebe13ee..0000000000 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml +++ /dev/null @@ -1,119 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: [] -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml b/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml deleted file mode 100644 index afa219ac63..0000000000 --- a/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml +++ /dev/null @@ -1,127 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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 - 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: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml b/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml deleted file mode 100644 index 914ebe13ee..0000000000 --- a/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml +++ /dev/null @@ -1,119 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: [] -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml b/ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml deleted file mode 100644 index 7e405e6281..0000000000 --- a/ci/environments/network/multiple-nics/nic-configs/compute-dvr.yaml +++ /dev/null @@ -1,180 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Tenant network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list - ExternalInterfaceDefaultRoute: - default: 10.0.0.1 - description: default route for the external network - type: string -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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 - next_hop: - get_param: ControlPlaneDefaultRoute - - type: ovs_bridge - name: br-ex - dns_servers: - get_param: DnsServers - domain: - get_param: DnsSearchDomains - use_dhcp: false - routes: - - ip_netmask: 0.0.0.0/0 - next_hop: - get_param: ExternalInterfaceDefaultRoute - members: - - type: interface - name: nic2 - mtu: 1350 - primary: true - - 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 - use_dhcp: false - addresses: - - ip_netmask: - get_param: TenantIpSubnet - members: - - type: interface - name: nic6 - mtu: 1350 - primary: true -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics/nic-configs/compute.yaml b/ci/environments/network/multiple-nics/nic-configs/compute.yaml deleted file mode 100644 index 8b3f83bdcc..0000000000 --- a/ci/environments/network/multiple-nics/nic-configs/compute.yaml +++ /dev/null @@ -1,162 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Tenant network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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 - 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 -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics/nic-configs/controller.yaml b/ci/environments/network/multiple-nics/nic-configs/controller.yaml deleted file mode 100644 index 1b3c9a82f4..0000000000 --- a/ci/environments/network/multiple-nics/nic-configs/controller.yaml +++ /dev/null @@ -1,226 +0,0 @@ -heat_template_version: rocky -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 - ExternalInterfaceRoutes: - default: [] - description: > - Routes for the external network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ExternalMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the External network. - type: number - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Tenant network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - ExternalNetworkVlanID: - default: 10 - description: Vlan ID for the external network traffic. - type: number - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ExternalInterfaceDefaultRoute: - default: 10.0.0.1 - description: default route for the external network - type: string - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: - - type: interface - name: nic1 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: - list_join: - - / - - - get_param: ControlPlaneIp - - get_param: ControlPlaneSubnetCidr - - type: ovs_bridge - name: br-ex - dns_servers: - get_param: DnsServers - domain: - get_param: DnsSearchDomains - use_dhcp: false - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - routes: - - ip_netmask: 0.0.0.0/0 - next_hop: - get_param: ExternalInterfaceDefaultRoute - members: - - type: interface - name: nic2 - mtu: 1350 - primary: true - - 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: interface - name: nic5 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: - get_param: StorageMgmtIpSubnet - - type: ovs_bridge - name: br-tenant - dns_servers: - get_param: DnsServers - use_dhcp: false - addresses: - - ip_netmask: - get_param: TenantIpSubnet - members: - - type: interface - name: nic6 - mtu: 1350 - primary: true -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml b/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml deleted file mode 100644 index 914ebe13ee..0000000000 --- a/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml +++ /dev/null @@ -1,119 +0,0 @@ -heat_template_version: rocky -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: bond_mode=active-backup - description: >- - The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's cidr - attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: >- - The default route of the control plane network. (The parameter is automatically resolved from the ctlplane subnet's - gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] Unless - the default is changed, the parameter is automatically resolved from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: >- - The maximum transmission unit (MTU) size(in bytes) that is guaranteed to pass through the data path of the segments - in the network. (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the - ctlplane subnet's dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: [] -outputs: - config: - description: The OsNetConfigImpl resource. - value: - get_attr: - - OsNetConfigImpl - - value - diff --git a/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml b/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml deleted file mode 100644 index 603aeaca34..0000000000 --- a/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml +++ /dev/null @@ -1,125 +0,0 @@ -heat_template_version: rocky - -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: 'bond_mode=active-backup' - description: The ovs_options string for the bond interface. Set things like - lacp=active and/or bond_mode=balance-slb using this option. - type: string - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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 - next_hop: {get_param: ControlPlaneDefaultRoute} - - type: interface - name: nic5 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: {get_param: StorageIpSubnet} - - type: interface - name: nic6 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: {get_param: StorageMgmtIpSubnet} - -outputs: - config: - description: The OsNetConfigImpl resource. - value: {get_attr: [OsNetConfigImpl, value]} diff --git a/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml b/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml deleted file mode 100644 index 336cd73825..0000000000 --- a/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml +++ /dev/null @@ -1,122 +0,0 @@ -heat_template_version: rocky - -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: 'bond_mode=active-backup' - description: The ovs_options string for the bond interface. Set things like - lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: [] - -outputs: - config: - description: The OsNetConfigImpl resource. - value: {get_attr: [OsNetConfigImpl, value]} diff --git a/ci/environments/network/public-bond/nic-configs/compute.yaml b/ci/environments/network/public-bond/nic-configs/compute.yaml deleted file mode 100644 index 5117645e7d..0000000000 --- a/ci/environments/network/public-bond/nic-configs/compute.yaml +++ /dev/null @@ -1,163 +0,0 @@ -heat_template_version: rocky - -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - TenantMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Tenant network. - type: number - BondInterfaceOvsOptions: - default: 'bond_mode=active-backup' - description: The ovs_options string for the bond interface. Set things like - lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - 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 - next_hop: {get_param: ControlPlaneDefaultRoute} - - type: interface - name: nic4 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: {get_param: InternalApiIpSubnet} - - type: interface - name: nic5 - 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: nic7 - mtu: 1350 - primary: true - -outputs: - config: - description: The OsNetConfigImpl resource. - value: {get_attr: [OsNetConfigImpl, value]} diff --git a/ci/environments/network/public-bond/nic-configs/controller.yaml b/ci/environments/network/public-bond/nic-configs/controller.yaml deleted file mode 100644 index 880ca1502e..0000000000 --- a/ci/environments/network/public-bond/nic-configs/controller.yaml +++ /dev/null @@ -1,230 +0,0 @@ -heat_template_version: rocky - -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 - ExternalInterfaceRoutes: - default: [] - description: > - Routes for the external network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - StorageMgmt network. - type: number - TenantIpSubnet: - default: '' - description: IP address/subnet on the tenant network - type: string - TenantInterfaceRoutes: - default: [] - description: > - Routes for the tenant network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - BondInterfaceOvsOptions: - default: 'bond_mode=active-backup' - description: The ovs_options string for the bond interface. Set things like - lacp=active and/or bond_mode=balance-slb using this option. - type: string - ExternalNetworkVlanID: - default: 10 - description: Vlan ID for the external network traffic. - type: number - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - TenantNetworkVlanID: - default: 50 - description: Vlan ID for the tenant network traffic. - type: number - ExternalInterfaceDefaultRoute: - default: '10.0.0.1' - description: default route for the external network - type: string - ExternalMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - External network. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - DnsSearchDomains: # Override this via parameter_defaults - default: [] - description: A list of DNS search domains to be added (in order) to resolv.conf. - type: comma_delimited_list - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: - - type: interface - name: nic1 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: - list_join: - - / - - - {get_param: ControlPlaneIp} - - {get_param: ControlPlaneSubnetCidr} - - type: ovs_bridge - name: br-ex - dns_servers: {get_param: DnsServers} - domain: {get_param: DnsSearchDomains} - use_dhcp: false - addresses: - - ip_netmask: {get_param: ExternalIpSubnet} - routes: - - ip_netmask: 0.0.0.0/0 - next_hop: {get_param: ExternalInterfaceDefaultRoute} - members: - - type: ovs_bond - name: bond1 - ovs_options: {get_param: BondInterfaceOvsOptions} - members: - - type: interface - name: nic2 - mtu: 1350 - primary: true - - type: interface - name: nic3 - mtu: 1350 - primary: false - - type: interface - name: nic4 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: {get_param: InternalApiIpSubnet} - - type: interface - name: nic5 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: {get_param: StorageIpSubnet} - - type: interface - name: nic6 - mtu: 1350 - use_dhcp: false - addresses: - - ip_netmask: {get_param: StorageMgmtIpSubnet} - - type: ovs_bridge - name: br-tenant - dns_servers: {get_param: DnsServers} - use_dhcp: false - addresses: - - ip_netmask: {get_param: TenantIpSubnet} - members: - - type: interface - name: nic7 - mtu: 1350 - primary: true - -outputs: - config: - description: The OsNetConfigImpl resource. - value: {get_attr: [OsNetConfigImpl, value]} diff --git a/ci/environments/network/public-bond/nic-configs/swift-storage.yaml b/ci/environments/network/public-bond/nic-configs/swift-storage.yaml deleted file mode 100644 index 336cd73825..0000000000 --- a/ci/environments/network/public-bond/nic-configs/swift-storage.yaml +++ /dev/null @@ -1,122 +0,0 @@ -heat_template_version: rocky - -parameters: - ControlPlaneIp: - default: '' - description: IP address/subnet on the ctlplane network - type: string - InternalApiIpSubnet: - default: '' - description: IP address/subnet on the internal_api network - type: string - InternalApiInterfaceRoutes: - default: [] - description: > - Routes for the internal_api network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - InternalApiMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - InternalApi network. - type: number - StorageIpSubnet: - default: '' - description: IP address/subnet on the storage network - type: string - StorageInterfaceRoutes: - default: [] - description: > - Routes for the storage network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - Storage network. - type: number - StorageMgmtIpSubnet: - default: '' - description: IP address/subnet on the storage_mgmt network - type: string - StorageMgmtInterfaceRoutes: - default: [] - description: > - Routes for the storage_mgmt network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - StorageMgmtMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the - StorageMgmt network. - type: number - BondInterfaceOvsOptions: - default: 'bond_mode=active-backup' - description: The ovs_options string for the bond interface. Set things like - lacp=active and/or bond_mode=balance-slb using this option. - type: string - InternalApiNetworkVlanID: - default: 20 - description: Vlan ID for the internal_api network traffic. - type: number - StorageNetworkVlanID: - default: 30 - description: Vlan ID for the storage network traffic. - type: number - StorageMgmtNetworkVlanID: - default: 40 - description: Vlan ID for the storage_mgmt network traffic. - type: number - ControlPlaneSubnetCidr: - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneDefaultRoute: - default: '' - description: The default route of the control plane network. (The parameter - is automatically resolved from the ctlplane subnet's gateway_ip attribute.) - type: string - ControlPlaneStaticRoutes: - default: [] - description: > - Routes for the ctlplane network traffic. - JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}] - Unless the default is changed, the parameter is automatically resolved - from the subnet host_routes attribute. - type: json - ControlPlaneMtu: - default: 1500 - description: The maximum transmission unit (MTU) size(in bytes) that is - guaranteed to pass through the data path of the segments in the network. - (The parameter is automatically resolved from the ctlplane network's mtu attribute.) - type: number - DnsServers: # Override this via parameter_defaults - default: [] - description: > - DNS servers to use for the Overcloud (2 max for some implementations). - If not set the nameservers configured in the ctlplane subnet's - dns_nameservers attribute will be used. - type: comma_delimited_list - -resources: - OsNetConfigImpl: - type: OS::Heat::Value - properties: - value: - network_config: [] - -outputs: - config: - description: The OsNetConfigImpl resource. - value: {get_attr: [OsNetConfigImpl, value]}