Enable net-iso for ovb jobs
The OVB networking layout differs somewhat from the old CI environment, so we have to use the templates from OVB. Ideally we would use the templates directly from the OVB repo, but it isn't part of OpenStack Git yet, so for the moment we just use a copy of them. They don't/can't change much without breaking existing users anyway, so this is low risk copy pasta. Change-Id: I0a2c8ca49cda2536b25884fcfeb3720b47c47863
This commit is contained in:
parent
37830f86e6
commit
f959179f36
@ -80,23 +80,22 @@ if [ $NETISO_V4 -eq 1 ] || [ $NETISO_V6 -eq 1 ]; then
|
||||
export EXTERNAL_NETWORK_GATEWAY=${EXTERNAL_NETWORK_GATEWAY:-"10.0.0.1"}
|
||||
|
||||
# Make our undercloud act as the external gateway
|
||||
# eth6 should line up with the "external" network port per the
|
||||
# tripleo-heat-template/network/config/multiple-nics templates.
|
||||
# OVB uses eth2 as the "external" network
|
||||
# NOTE: seed uses eth0 for the local network.
|
||||
cat >> /tmp/eth6.cfg <<EOF_CAT
|
||||
cat >> /tmp/eth2.cfg <<EOF_CAT
|
||||
network_config:
|
||||
- type: interface
|
||||
name: eth6
|
||||
name: eth2
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: 10.0.0.1/24
|
||||
EOF_CAT
|
||||
if [ $NETISO_V6 -eq 1 ]; then
|
||||
cat >> /tmp/eth6.cfg <<EOF_CAT
|
||||
cat >> /tmp/eth2.cfg <<EOF_CAT
|
||||
- ip_netmask: 2001:db8:fd00:1000::1/64
|
||||
EOF_CAT
|
||||
fi
|
||||
sudo os-net-config -c /tmp/eth6.cfg -v
|
||||
sudo os-net-config -c /tmp/eth2.cfg -v
|
||||
fi
|
||||
|
||||
if [ "$OSINFRA" = "0" ]; then
|
||||
|
25
test-environments/network-templates/network-environment.yaml
Normal file
25
test-environments/network-templates/network-environment.yaml
Normal file
@ -0,0 +1,25 @@
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControlPlaneSubnetCidr: '24'
|
||||
ControlPlaneDefaultRoute: 192.0.2.1
|
||||
EC2MetadataIp: 192.0.2.1
|
||||
ExternalNetCidr: 10.0.0.0/24
|
||||
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
|
||||
ExternalInterfaceDefaultRoute: 10.0.0.1
|
||||
NeutronExternalNetworkBridge: "''"
|
||||
InternalApiNetCidr: 172.17.0.0/24
|
||||
InternalApiAllocationPools: [{"start": "172.17.0.10", "end": "172.17.0.250"}]
|
||||
StorageNetCidr: 172.18.0.0/24
|
||||
StorageAllocationPools: [{"start": "172.18.0.10", "end": "172.18.0.250"}]
|
||||
StorageMgmtNetCidr: 172.19.0.0/24
|
||||
StorageMgmtAllocationPools: [{"start": "172.19.0.10", "end": "172.19.0.250"}]
|
||||
TenantNetCidr: 172.16.0.0/24
|
||||
TenantAllocationPools: [{"start": "172.16.0.10", "end": "172.16.0.250"}]
|
||||
DnsServers: ["8.8.8.8", "8.8.4.4"]
|
29
test-environments/network-templates/network-isolation.yaml
Normal file
29
test-environments/network-templates/network-isolation.yaml
Normal file
@ -0,0 +1,29 @@
|
||||
resource_registry:
|
||||
# Redis
|
||||
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml
|
||||
OS::TripleO::Controller::Ports::RedisVipPort: ../network/ports/vip.yaml
|
||||
# External
|
||||
OS::TripleO::Network::External: ../network/external.yaml
|
||||
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml
|
||||
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external.yaml
|
||||
# InternalApi
|
||||
OS::TripleO::Network::InternalApi: ../network/internal_api.yaml
|
||||
OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api.yaml
|
||||
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api.yaml
|
||||
OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api.yaml
|
||||
# Storage
|
||||
OS::TripleO::Network::Storage: ../network/storage.yaml
|
||||
OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage.yaml
|
||||
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage.yaml
|
||||
OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage.yaml
|
||||
OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage.yaml
|
||||
# StorageMgmt
|
||||
OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt.yaml
|
||||
OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt.yaml
|
||||
OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
|
||||
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
|
||||
# Tenant
|
||||
OS::TripleO::Network::Tenant: ../network/tenant.yaml
|
||||
OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml
|
||||
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml
|
||||
OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml
|
@ -0,0 +1,119 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
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
|
||||
InternalApiIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the internal API network
|
||||
type: string
|
||||
StorageIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage network
|
||||
type: string
|
||||
StorageMgmtIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage mgmt network
|
||||
type: string
|
||||
TenantIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the tenant network
|
||||
type: string
|
||||
ManagementIpSubnet: # Only populated when including environments/network-management.yaml
|
||||
default: ''
|
||||
description: IP address/subnet on the management network
|
||||
type: string
|
||||
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
|
||||
ManagementNetworkVlanID:
|
||||
default: 60
|
||||
description: Vlan ID for the management network traffic.
|
||||
type: number
|
||||
ExternalInterfaceDefaultRoute:
|
||||
default: '10.0.0.1'
|
||||
description: default route for the external network
|
||||
type: string
|
||||
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
||||
default: '24'
|
||||
description: The subnet CIDR of the control plane network.
|
||||
type: string
|
||||
ControlPlaneDefaultRoute: # Override this via parameter_defaults
|
||||
description: The default route of the control plane network.
|
||||
type: string
|
||||
DnsServers: # Override this via parameter_defaults
|
||||
default: []
|
||||
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
||||
type: comma_delimited_list
|
||||
EC2MetadataIp: # Override this via parameter_defaults
|
||||
description: The IP address of the EC2 metadata server.
|
||||
type: string
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
properties:
|
||||
config:
|
||||
os_net_config:
|
||||
network_config:
|
||||
- addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
mtu: 1350
|
||||
name: nic1
|
||||
routes:
|
||||
- ip_netmask: 169.254.169.254/32
|
||||
next_hop: {get_param: EC2MetadataIp}
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic4
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic5
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
group: os-apply-config
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
@ -0,0 +1,92 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
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
|
||||
InternalApiIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the internal API network
|
||||
type: string
|
||||
StorageIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage network
|
||||
type: string
|
||||
StorageMgmtIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage mgmt network
|
||||
type: string
|
||||
TenantIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the tenant network
|
||||
type: string
|
||||
ManagementIpSubnet: # Only populated when including environments/network-management.yaml
|
||||
default: ''
|
||||
description: IP address/subnet on the management network
|
||||
type: string
|
||||
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
|
||||
ManagementNetworkVlanID:
|
||||
default: 60
|
||||
description: Vlan ID for the management network traffic.
|
||||
type: number
|
||||
ExternalInterfaceDefaultRoute:
|
||||
default: '10.0.0.1'
|
||||
description: default route for the external network
|
||||
type: string
|
||||
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
||||
default: '24'
|
||||
description: The subnet CIDR of the control plane network.
|
||||
type: string
|
||||
ControlPlaneDefaultRoute: # Override this via parameter_defaults
|
||||
description: The default route of the control plane network.
|
||||
type: string
|
||||
DnsServers: # Override this via parameter_defaults
|
||||
default: []
|
||||
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
||||
type: comma_delimited_list
|
||||
EC2MetadataIp: # Override this via parameter_defaults
|
||||
description: The IP address of the EC2 metadata server.
|
||||
type: string
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
properties:
|
||||
config:
|
||||
os_net_config:
|
||||
network_config: []
|
||||
group: os-apply-config
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
130
test-environments/network-templates/nic-configs/compute.yaml
Normal file
130
test-environments/network-templates/nic-configs/compute.yaml
Normal file
@ -0,0 +1,130 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
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
|
||||
InternalApiIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the internal API network
|
||||
type: string
|
||||
StorageIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage network
|
||||
type: string
|
||||
StorageMgmtIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage mgmt network
|
||||
type: string
|
||||
TenantIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the tenant network
|
||||
type: string
|
||||
ManagementIpSubnet: # Only populated when including environments/network-management.yaml
|
||||
default: ''
|
||||
description: IP address/subnet on the management network
|
||||
type: string
|
||||
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
|
||||
ManagementNetworkVlanID:
|
||||
default: 60
|
||||
description: Vlan ID for the management network traffic.
|
||||
type: number
|
||||
ExternalInterfaceDefaultRoute:
|
||||
default: '10.0.0.1'
|
||||
description: default route for the external network
|
||||
type: string
|
||||
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
||||
default: '24'
|
||||
description: The subnet CIDR of the control plane network.
|
||||
type: string
|
||||
ControlPlaneDefaultRoute: # Override this via parameter_defaults
|
||||
description: The default route of the control plane network.
|
||||
type: string
|
||||
DnsServers: # Override this via parameter_defaults
|
||||
default: []
|
||||
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
||||
type: comma_delimited_list
|
||||
EC2MetadataIp: # Override this via parameter_defaults
|
||||
description: The IP address of the EC2 metadata server.
|
||||
type: string
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
properties:
|
||||
config:
|
||||
os_net_config:
|
||||
network_config:
|
||||
- addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
mtu: 1350
|
||||
name: nic1
|
||||
routes:
|
||||
- ip_netmask: 169.254.169.254/32
|
||||
next_hop: {get_param: EC2MetadataIp}
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic3
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic4
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
dns_servers: {get_param: DnsServers}
|
||||
members:
|
||||
- mtu: 1350
|
||||
name: nic6
|
||||
primary: true
|
||||
type: interface
|
||||
name: br-tenant
|
||||
type: ovs_bridge
|
||||
use_dhcp: false
|
||||
group: os-apply-config
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
148
test-environments/network-templates/nic-configs/controller.yaml
Normal file
148
test-environments/network-templates/nic-configs/controller.yaml
Normal file
@ -0,0 +1,148 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
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
|
||||
InternalApiIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the internal API network
|
||||
type: string
|
||||
StorageIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage network
|
||||
type: string
|
||||
StorageMgmtIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage mgmt network
|
||||
type: string
|
||||
TenantIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the tenant network
|
||||
type: string
|
||||
ManagementIpSubnet: # Only populated when including environments/network-management.yaml
|
||||
default: ''
|
||||
description: IP address/subnet on the management network
|
||||
type: string
|
||||
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
|
||||
ManagementNetworkVlanID:
|
||||
default: 60
|
||||
description: Vlan ID for the management network traffic.
|
||||
type: number
|
||||
ExternalInterfaceDefaultRoute:
|
||||
default: '10.0.0.1'
|
||||
description: default route for the external network
|
||||
type: string
|
||||
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
||||
default: '24'
|
||||
description: The subnet CIDR of the control plane network.
|
||||
type: string
|
||||
ControlPlaneDefaultRoute: # Override this via parameter_defaults
|
||||
description: The default route of the control plane network.
|
||||
type: string
|
||||
DnsServers: # Override this via parameter_defaults
|
||||
default: []
|
||||
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
||||
type: comma_delimited_list
|
||||
EC2MetadataIp: # Override this via parameter_defaults
|
||||
description: The IP address of the EC2 metadata server.
|
||||
type: string
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
properties:
|
||||
config:
|
||||
os_net_config:
|
||||
network_config:
|
||||
- addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
mtu: 1350
|
||||
name: nic1
|
||||
routes:
|
||||
- ip_netmask: 169.254.169.254/32
|
||||
next_hop: {get_param: EC2MetadataIp}
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
dns_servers: {get_param: DnsServers}
|
||||
members:
|
||||
- mtu: 1350
|
||||
name: nic2
|
||||
primary: true
|
||||
type: interface
|
||||
name: br-ex
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
type: ovs_bridge
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic3
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic4
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
mtu: 1350
|
||||
name: nic5
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
dns_servers: {get_param: DnsServers}
|
||||
members:
|
||||
- mtu: 1350
|
||||
name: nic6
|
||||
primary: true
|
||||
type: interface
|
||||
name: br-tenant
|
||||
type: ovs_bridge
|
||||
use_dhcp: false
|
||||
group: os-apply-config
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
@ -0,0 +1,92 @@
|
||||
heat_template_version: 2015-04-30
|
||||
|
||||
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
|
||||
InternalApiIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the internal API network
|
||||
type: string
|
||||
StorageIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage network
|
||||
type: string
|
||||
StorageMgmtIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the storage mgmt network
|
||||
type: string
|
||||
TenantIpSubnet:
|
||||
default: ''
|
||||
description: IP address/subnet on the tenant network
|
||||
type: string
|
||||
ManagementIpSubnet: # Only populated when including environments/network-management.yaml
|
||||
default: ''
|
||||
description: IP address/subnet on the management network
|
||||
type: string
|
||||
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
|
||||
ManagementNetworkVlanID:
|
||||
default: 60
|
||||
description: Vlan ID for the management network traffic.
|
||||
type: number
|
||||
ExternalInterfaceDefaultRoute:
|
||||
default: '10.0.0.1'
|
||||
description: default route for the external network
|
||||
type: string
|
||||
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
||||
default: '24'
|
||||
description: The subnet CIDR of the control plane network.
|
||||
type: string
|
||||
ControlPlaneDefaultRoute: # Override this via parameter_defaults
|
||||
description: The default route of the control plane network.
|
||||
type: string
|
||||
DnsServers: # Override this via parameter_defaults
|
||||
default: []
|
||||
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
||||
type: comma_delimited_list
|
||||
EC2MetadataIp: # Override this via parameter_defaults
|
||||
description: The IP address of the EC2 metadata server.
|
||||
type: string
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
properties:
|
||||
config:
|
||||
os_net_config:
|
||||
network_config: []
|
||||
group: os-apply-config
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
635
test-environments/network-templates/ui-settings.pickle
Normal file
635
test-environments/network-templates/ui-settings.pickle
Normal file
@ -0,0 +1,635 @@
|
||||
(dp0
|
||||
S'global_data'
|
||||
p1
|
||||
(dp2
|
||||
S'control'
|
||||
p3
|
||||
(dp4
|
||||
S'route'
|
||||
p5
|
||||
V192.0.2.1
|
||||
p6
|
||||
sS'mask'
|
||||
p7
|
||||
I24
|
||||
sS'ec2'
|
||||
p8
|
||||
V192.0.2.1
|
||||
p9
|
||||
ssS'major'
|
||||
p10
|
||||
I1
|
||||
sS'management'
|
||||
p11
|
||||
(dp12
|
||||
S'start'
|
||||
p13
|
||||
V172.20.0.10
|
||||
p14
|
||||
sS'cidr'
|
||||
p15
|
||||
V172.20.0.0/24
|
||||
p16
|
||||
sS'vlan'
|
||||
p17
|
||||
I6
|
||||
sS'end'
|
||||
p18
|
||||
V172.20.0.250
|
||||
p19
|
||||
ssS'dns2'
|
||||
p20
|
||||
V8.8.4.4
|
||||
p21
|
||||
sS'dns1'
|
||||
p22
|
||||
V8.8.8.8
|
||||
p23
|
||||
sS'storage'
|
||||
p24
|
||||
(dp25
|
||||
g13
|
||||
V172.18.0.10
|
||||
p26
|
||||
sg15
|
||||
V172.18.0.0/24
|
||||
p27
|
||||
sg17
|
||||
I3
|
||||
sg18
|
||||
V172.18.0.250
|
||||
p28
|
||||
ssS'bond_options'
|
||||
p29
|
||||
V
|
||||
p30
|
||||
sS'external'
|
||||
p31
|
||||
(dp32
|
||||
S'bridge'
|
||||
p33
|
||||
V''
|
||||
p34
|
||||
sg18
|
||||
V10.0.0.50
|
||||
p35
|
||||
sg17
|
||||
I1
|
||||
sg13
|
||||
V10.0.0.10
|
||||
p36
|
||||
sg15
|
||||
V10.0.0.0/24
|
||||
p37
|
||||
sS'gateway'
|
||||
p38
|
||||
V10.0.0.1
|
||||
p39
|
||||
ssS'internal_api'
|
||||
p40
|
||||
(dp41
|
||||
g13
|
||||
V172.17.0.10
|
||||
p42
|
||||
sg15
|
||||
V172.17.0.0/24
|
||||
p43
|
||||
sg17
|
||||
I2
|
||||
sg18
|
||||
V172.17.0.250
|
||||
p44
|
||||
ssS'storage_mgmt'
|
||||
p45
|
||||
(dp46
|
||||
g13
|
||||
V172.19.0.10
|
||||
p47
|
||||
sg15
|
||||
V172.19.0.0/24
|
||||
p48
|
||||
sg17
|
||||
I4
|
||||
sg18
|
||||
V172.19.0.250
|
||||
p49
|
||||
ssS'minor'
|
||||
p50
|
||||
I2
|
||||
sS'tenant'
|
||||
p51
|
||||
(dp52
|
||||
g13
|
||||
V172.16.0.10
|
||||
p53
|
||||
sg15
|
||||
V172.16.0.0/24
|
||||
p54
|
||||
sg17
|
||||
I5
|
||||
sg18
|
||||
V172.16.0.250
|
||||
p55
|
||||
sssS'data'
|
||||
p56
|
||||
(dp57
|
||||
S'cinder-storage.yaml'
|
||||
p58
|
||||
(lp59
|
||||
sS'ceph-storage.yaml'
|
||||
p60
|
||||
(lp61
|
||||
(dp62
|
||||
Vaddresses
|
||||
p63
|
||||
(lp64
|
||||
sVnetwork
|
||||
p65
|
||||
VControlPlane
|
||||
p66
|
||||
sVprimary
|
||||
p67
|
||||
I01
|
||||
sVmtu
|
||||
p68
|
||||
I1350
|
||||
sS'members'
|
||||
p69
|
||||
(lp70
|
||||
sVroutes
|
||||
p71
|
||||
(lp72
|
||||
sVuse_dhcp
|
||||
p73
|
||||
I00
|
||||
sVtype
|
||||
p74
|
||||
Vinterface
|
||||
p75
|
||||
sVname
|
||||
p76
|
||||
Vnic1
|
||||
p77
|
||||
sa(dp78
|
||||
Vaddresses
|
||||
p79
|
||||
(lp80
|
||||
sVnetwork
|
||||
p81
|
||||
VStorage
|
||||
p82
|
||||
sVprimary
|
||||
p83
|
||||
I01
|
||||
sVmtu
|
||||
p84
|
||||
I1350
|
||||
sg69
|
||||
(lp85
|
||||
sVroutes
|
||||
p86
|
||||
(lp87
|
||||
sVuse_dhcp
|
||||
p88
|
||||
I00
|
||||
sVtype
|
||||
p89
|
||||
Vinterface
|
||||
p90
|
||||
sVname
|
||||
p91
|
||||
Vnic4
|
||||
p92
|
||||
sa(dp93
|
||||
Vaddresses
|
||||
p94
|
||||
(lp95
|
||||
sVnetwork
|
||||
p96
|
||||
VStorageMgmt
|
||||
p97
|
||||
sVprimary
|
||||
p98
|
||||
I01
|
||||
sVmtu
|
||||
p99
|
||||
I1350
|
||||
sg69
|
||||
(lp100
|
||||
sVroutes
|
||||
p101
|
||||
(lp102
|
||||
sVuse_dhcp
|
||||
p103
|
||||
I00
|
||||
sVtype
|
||||
p104
|
||||
Vinterface
|
||||
p105
|
||||
sVname
|
||||
p106
|
||||
Vnic5
|
||||
p107
|
||||
sasS'controller.yaml'
|
||||
p108
|
||||
(lp109
|
||||
(dp110
|
||||
Vaddresses
|
||||
p111
|
||||
(lp112
|
||||
sVnetwork
|
||||
p113
|
||||
VControlPlane
|
||||
p114
|
||||
sVprimary
|
||||
p115
|
||||
I01
|
||||
sVmtu
|
||||
p116
|
||||
I1350
|
||||
sg69
|
||||
(lp117
|
||||
sVroutes
|
||||
p118
|
||||
(lp119
|
||||
sVuse_dhcp
|
||||
p120
|
||||
I00
|
||||
sVtype
|
||||
p121
|
||||
Vinterface
|
||||
p122
|
||||
sVname
|
||||
p123
|
||||
Vnic1
|
||||
p124
|
||||
sa(dp125
|
||||
Vdns_servers
|
||||
p126
|
||||
V{get_param: DnsServers}
|
||||
p127
|
||||
sVaddresses
|
||||
p128
|
||||
(lp129
|
||||
sVnetwork
|
||||
p130
|
||||
VExternal
|
||||
p131
|
||||
sVmtu
|
||||
p132
|
||||
I-1
|
||||
sg69
|
||||
(lp133
|
||||
(dp134
|
||||
Vaddresses
|
||||
p135
|
||||
(lp136
|
||||
sVnetwork
|
||||
p137
|
||||
VNone
|
||||
p138
|
||||
sVprimary
|
||||
p139
|
||||
I01
|
||||
sVmtu
|
||||
p140
|
||||
I1350
|
||||
sg69
|
||||
(lp141
|
||||
sVroutes
|
||||
p142
|
||||
(lp143
|
||||
sVuse_dhcp
|
||||
p144
|
||||
I00
|
||||
sVtype
|
||||
p145
|
||||
Vinterface
|
||||
p146
|
||||
sVname
|
||||
p147
|
||||
Vnic2
|
||||
p148
|
||||
sasVroutes
|
||||
p149
|
||||
(lp150
|
||||
sVuse_dhcp
|
||||
p151
|
||||
I00
|
||||
sVtype
|
||||
p152
|
||||
Vovs_bridge
|
||||
p153
|
||||
sVname
|
||||
p154
|
||||
Vbr-ex
|
||||
p155
|
||||
sa(dp156
|
||||
Vaddresses
|
||||
p157
|
||||
(lp158
|
||||
sVnetwork
|
||||
p159
|
||||
VInternalApi
|
||||
p160
|
||||
sVprimary
|
||||
p161
|
||||
I01
|
||||
sVmtu
|
||||
p162
|
||||
I1350
|
||||
sg69
|
||||
(lp163
|
||||
sVroutes
|
||||
p164
|
||||
(lp165
|
||||
sVuse_dhcp
|
||||
p166
|
||||
I00
|
||||
sVtype
|
||||
p167
|
||||
Vinterface
|
||||
p168
|
||||
sVname
|
||||
p169
|
||||
Vnic3
|
||||
p170
|
||||
sa(dp171
|
||||
Vaddresses
|
||||
p172
|
||||
(lp173
|
||||
sVnetwork
|
||||
p174
|
||||
VStorage
|
||||
p175
|
||||
sVprimary
|
||||
p176
|
||||
I01
|
||||
sVmtu
|
||||
p177
|
||||
I1350
|
||||
sg69
|
||||
(lp178
|
||||
sVroutes
|
||||
p179
|
||||
(lp180
|
||||
sVuse_dhcp
|
||||
p181
|
||||
I00
|
||||
sVtype
|
||||
p182
|
||||
Vinterface
|
||||
p183
|
||||
sVname
|
||||
p184
|
||||
Vnic4
|
||||
p185
|
||||
sa(dp186
|
||||
Vaddresses
|
||||
p187
|
||||
(lp188
|
||||
sVnetwork
|
||||
p189
|
||||
VStorageMgmt
|
||||
p190
|
||||
sVprimary
|
||||
p191
|
||||
I01
|
||||
sVmtu
|
||||
p192
|
||||
I1350
|
||||
sg69
|
||||
(lp193
|
||||
sVroutes
|
||||
p194
|
||||
(lp195
|
||||
sVuse_dhcp
|
||||
p196
|
||||
I00
|
||||
sVtype
|
||||
p197
|
||||
Vinterface
|
||||
p198
|
||||
sVname
|
||||
p199
|
||||
Vnic5
|
||||
p200
|
||||
sa(dp201
|
||||
Vdns_servers
|
||||
p202
|
||||
V{get_param: DnsServers}
|
||||
p203
|
||||
sVaddresses
|
||||
p204
|
||||
(lp205
|
||||
sVnetwork
|
||||
p206
|
||||
VTenant
|
||||
p207
|
||||
sVmtu
|
||||
p208
|
||||
I-1
|
||||
sg69
|
||||
(lp209
|
||||
(dp210
|
||||
Vaddresses
|
||||
p211
|
||||
(lp212
|
||||
sVnetwork
|
||||
p213
|
||||
VNone
|
||||
p214
|
||||
sVprimary
|
||||
p215
|
||||
I01
|
||||
sVmtu
|
||||
p216
|
||||
I1350
|
||||
sg69
|
||||
(lp217
|
||||
sVroutes
|
||||
p218
|
||||
(lp219
|
||||
sVuse_dhcp
|
||||
p220
|
||||
I00
|
||||
sVtype
|
||||
p221
|
||||
Vinterface
|
||||
p222
|
||||
sVname
|
||||
p223
|
||||
Vnic6
|
||||
p224
|
||||
sasVroutes
|
||||
p225
|
||||
(lp226
|
||||
sVuse_dhcp
|
||||
p227
|
||||
I00
|
||||
sVtype
|
||||
p228
|
||||
Vovs_bridge
|
||||
p229
|
||||
sVname
|
||||
p230
|
||||
Vbr-tenant
|
||||
p231
|
||||
sasS'swift-storage.yaml'
|
||||
p232
|
||||
(lp233
|
||||
sS'compute.yaml'
|
||||
p234
|
||||
(lp235
|
||||
(dp236
|
||||
Vaddresses
|
||||
p237
|
||||
(lp238
|
||||
sVnetwork
|
||||
p239
|
||||
VControlPlane
|
||||
p240
|
||||
sVprimary
|
||||
p241
|
||||
I01
|
||||
sVmtu
|
||||
p242
|
||||
I1350
|
||||
sg69
|
||||
(lp243
|
||||
sVroutes
|
||||
p244
|
||||
(lp245
|
||||
sVuse_dhcp
|
||||
p246
|
||||
I00
|
||||
sVtype
|
||||
p247
|
||||
Vinterface
|
||||
p248
|
||||
sVname
|
||||
p249
|
||||
Vnic1
|
||||
p250
|
||||
sa(dp251
|
||||
Vaddresses
|
||||
p252
|
||||
(lp253
|
||||
sVnetwork
|
||||
p254
|
||||
VInternalApi
|
||||
p255
|
||||
sVprimary
|
||||
p256
|
||||
I01
|
||||
sVmtu
|
||||
p257
|
||||
I1350
|
||||
sg69
|
||||
(lp258
|
||||
sVroutes
|
||||
p259
|
||||
(lp260
|
||||
sVuse_dhcp
|
||||
p261
|
||||
I00
|
||||
sVtype
|
||||
p262
|
||||
Vinterface
|
||||
p263
|
||||
sVname
|
||||
p264
|
||||
Vnic3
|
||||
p265
|
||||
sa(dp266
|
||||
Vaddresses
|
||||
p267
|
||||
(lp268
|
||||
sVnetwork
|
||||
p269
|
||||
VStorage
|
||||
p270
|
||||
sVprimary
|
||||
p271
|
||||
I01
|
||||
sVmtu
|
||||
p272
|
||||
I1350
|
||||
sg69
|
||||
(lp273
|
||||
sVroutes
|
||||
p274
|
||||
(lp275
|
||||
sVuse_dhcp
|
||||
p276
|
||||
I00
|
||||
sVtype
|
||||
p277
|
||||
Vinterface
|
||||
p278
|
||||
sVname
|
||||
p279
|
||||
Vnic4
|
||||
p280
|
||||
sa(dp281
|
||||
Vdns_servers
|
||||
p282
|
||||
V{get_param: DnsServers}
|
||||
p283
|
||||
sVaddresses
|
||||
p284
|
||||
(lp285
|
||||
sVnetwork
|
||||
p286
|
||||
VTenant
|
||||
p287
|
||||
sVmtu
|
||||
p288
|
||||
I-1
|
||||
sg69
|
||||
(lp289
|
||||
(dp290
|
||||
Vaddresses
|
||||
p291
|
||||
(lp292
|
||||
sVnetwork
|
||||
p293
|
||||
VNone
|
||||
p294
|
||||
sVprimary
|
||||
p295
|
||||
I01
|
||||
sVmtu
|
||||
p296
|
||||
I1350
|
||||
sg69
|
||||
(lp297
|
||||
sVroutes
|
||||
p298
|
||||
(lp299
|
||||
sVuse_dhcp
|
||||
p300
|
||||
I00
|
||||
sVtype
|
||||
p301
|
||||
Vinterface
|
||||
p302
|
||||
sVname
|
||||
p303
|
||||
Vnic6
|
||||
p304
|
||||
sasVroutes
|
||||
p305
|
||||
(lp306
|
||||
sVuse_dhcp
|
||||
p307
|
||||
I00
|
||||
sVtype
|
||||
p308
|
||||
Vovs_bridge
|
||||
p309
|
||||
sVname
|
||||
p310
|
||||
Vbr-tenant
|
||||
p311
|
||||
sass.
|
@ -113,7 +113,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||
# In ci our overcloud nodes don't have access to an external netwrok
|
||||
# --ntp-server is here to make the deploy command happy, the ci env
|
||||
# is on virt so the clocks should be in sync without it.
|
||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/net-multiple-nics.yaml -e /opt/stack/new/tripleo-ci/test-environments/net-iso.yaml"
|
||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /opt/stack/new/tripleo-ci/test-environments/network-templates/network-environment.yaml -e /opt/stack/new/tripleo-ci/test-environments/net-iso.yaml"
|
||||
NETISO_V4=1
|
||||
PACEMAKER=1
|
||||
;;
|
||||
@ -122,7 +122,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||
# In ci our overcloud nodes don't have access to an external netwrok
|
||||
# --ntp-server is here to make the deploy command happy, the ci env
|
||||
# is on virt so the clocks should be in sync without it.
|
||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ceph-storage-scale 1 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml"
|
||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ceph-storage-scale 1 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e /opt/stack/new/tripleo-ci/test-environments/network-templates/network-environment.yaml -e /opt/stack/new/tripleo-ci/test-environments/net-iso.yaml"
|
||||
NETISO_V4=1
|
||||
PACEMAKER=1
|
||||
;;
|
||||
nonha)
|
||||
|
Loading…
Reference in New Issue
Block a user