Merge "Start using nic-configs from THT repo instead of tripleo-ci"
This commit is contained in:
Zuul
Gerrit Code Review
commit
effa7ec0cd
|
|
@ -0,0 +1,23 @@
|
|||
Generated Network Isolation Templates
|
||||
-------------------------------------
|
||||
These templates were generated by the UI tool at
|
||||
https://github.com/cybertron/tripleo-scripts#net-iso-genpy
|
||||
|
||||
ui-settings.pickle is specific to the tool. TripleO will not use it when
|
||||
doing deployments with these templates, but it is needed to be able to
|
||||
load the templates into the UI again. Note that the UI only reads this file,
|
||||
so any changes made by hand to the templates will not be reflected in the UI.
|
||||
|
||||
The network-isolation.yaml file needs to reference the port files shipped with
|
||||
tripleo-heat-templates, so by default the tool generates the paths assuming
|
||||
network-isolation.yaml will be copied into the environments/ directory of
|
||||
tripleo-heat-templates.
|
||||
|
||||
If the standard tripleo-heat-templates are in use, then the
|
||||
network-isolation-absolute.yaml file can be used instead. It has hard-coded
|
||||
references to the port files in /usr/share/openstack-tripleo-heat-templates.
|
||||
|
||||
If the generated network isolation templates are at ~/generated-templates, an
|
||||
example deployment command would look like:
|
||||
|
||||
openstack overcloud deploy --templates -e ~/generated-templates/network-isolation-absolute.yaml -e ~/generated-templates/network-environment.yaml
|
||||
|
|
@ -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.168.24.1
|
||||
EC2MetadataIp: 192.168.24.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"]
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
resource_registry:
|
||||
# Redis
|
||||
OS::TripleO::Network::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip.yaml
|
||||
# External
|
||||
OS::TripleO::Network::External: /usr/share/openstack-tripleo-heat-templates/network/external.yaml
|
||||
OS::TripleO::Network::Ports::ExternalVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml
|
||||
OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml
|
||||
# InternalApi
|
||||
OS::TripleO::Network::InternalApi: /usr/share/openstack-tripleo-heat-templates/network/internal_api.yaml
|
||||
OS::TripleO::Network::Ports::InternalApiVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml
|
||||
OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml
|
||||
OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml
|
||||
# Storage
|
||||
OS::TripleO::Network::Storage: /usr/share/openstack-tripleo-heat-templates/network/storage.yaml
|
||||
OS::TripleO::Network::Ports::StorageVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml
|
||||
OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml
|
||||
OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml
|
||||
OS::TripleO::CephStorage::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml
|
||||
# StorageMgmt
|
||||
OS::TripleO::Network::StorageMgmt: /usr/share/openstack-tripleo-heat-templates/network/storage_mgmt.yaml
|
||||
OS::TripleO::Network::Ports::StorageMgmtVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
|
||||
OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
|
||||
OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
|
||||
OS::TripleO::CephStorage::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
|
||||
# Tenant
|
||||
OS::TripleO::Network::Tenant: /usr/share/openstack-tripleo-heat-templates/network/tenant.yaml
|
||||
OS::TripleO::Network::Ports::TenantVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml
|
||||
OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml
|
||||
OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
resource_registry:
|
||||
# Redis
|
||||
OS::TripleO::Network::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::Compute::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: pike
|
||||
|
||||
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:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- ip_netmask: 169.254.169.254/32
|
||||
next_hop: {get_param: EC2MetadataIp}
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- 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}
|
||||
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: pike
|
||||
|
||||
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}
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
heat_template_version: pike
|
||||
|
||||
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:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- ip_netmask: 169.254.169.254/32
|
||||
next_hop: {get_param: EC2MetadataIp}
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- 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
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
group: os-apply-config
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
heat_template_version: pike
|
||||
|
||||
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:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- ip_netmask: 169.254.169.254/32
|
||||
next_hop: {get_param: EC2MetadataIp}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
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
|
||||
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: pike
|
||||
|
||||
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}
|
||||
|
|
@ -0,0 +1,716 @@
|
|||
(dp0
|
||||
S'global_data'
|
||||
p1
|
||||
(dp2
|
||||
S'control'
|
||||
p3
|
||||
(dp4
|
||||
S'route'
|
||||
p5
|
||||
V192.168.24.1
|
||||
p6
|
||||
sS'mask'
|
||||
p7
|
||||
I24
|
||||
sS'ec2'
|
||||
p8
|
||||
V192.168.24.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'auto_routes'
|
||||
p29
|
||||
I01
|
||||
sS'bond_options'
|
||||
p30
|
||||
V
|
||||
p31
|
||||
sS'version'
|
||||
p32
|
||||
I1
|
||||
sS'external'
|
||||
p33
|
||||
(dp34
|
||||
S'bridge'
|
||||
p35
|
||||
V''
|
||||
p36
|
||||
sg18
|
||||
V10.0.0.50
|
||||
p37
|
||||
sg17
|
||||
I1
|
||||
sg13
|
||||
V10.0.0.10
|
||||
p38
|
||||
sg15
|
||||
V10.0.0.0/24
|
||||
p39
|
||||
sS'gateway'
|
||||
p40
|
||||
V10.0.0.1
|
||||
p41
|
||||
ssS'internal_api'
|
||||
p42
|
||||
(dp43
|
||||
g13
|
||||
V172.17.0.10
|
||||
p44
|
||||
sg15
|
||||
V172.17.0.0/24
|
||||
p45
|
||||
sg17
|
||||
I2
|
||||
sg18
|
||||
V172.17.0.250
|
||||
p46
|
||||
ssS'ipv6'
|
||||
p47
|
||||
I00
|
||||
sS'storage_mgmt'
|
||||
p48
|
||||
(dp49
|
||||
g13
|
||||
V172.19.0.10
|
||||
p50
|
||||
sg15
|
||||
V172.19.0.0/24
|
||||
p51
|
||||
sg17
|
||||
I4
|
||||
sg18
|
||||
V172.19.0.250
|
||||
p52
|
||||
ssS'minor'
|
||||
p53
|
||||
I2
|
||||
sS'tenant'
|
||||
p54
|
||||
(dp55
|
||||
g13
|
||||
V172.16.0.10
|
||||
p56
|
||||
sg15
|
||||
V172.16.0.0/24
|
||||
p57
|
||||
sg17
|
||||
I5
|
||||
sg18
|
||||
V172.16.0.250
|
||||
p58
|
||||
sssS'data'
|
||||
p59
|
||||
(dp60
|
||||
S'cinder-storage.yaml'
|
||||
p61
|
||||
(lp62
|
||||
sS'ceph-storage.yaml'
|
||||
p63
|
||||
(lp64
|
||||
(dp65
|
||||
Vaddresses
|
||||
p66
|
||||
(lp67
|
||||
sVnetwork
|
||||
p68
|
||||
VControlPlane
|
||||
p69
|
||||
sVprimary
|
||||
p70
|
||||
I01
|
||||
sVmtu
|
||||
p71
|
||||
I1350
|
||||
sVport_name
|
||||
p72
|
||||
g31
|
||||
sS'members'
|
||||
p73
|
||||
(lp74
|
||||
sVroutes
|
||||
p75
|
||||
(lp76
|
||||
sVuse_dhcp
|
||||
p77
|
||||
I00
|
||||
sVtype
|
||||
p78
|
||||
Vinterface
|
||||
p79
|
||||
sVname
|
||||
p80
|
||||
Vnic1
|
||||
p81
|
||||
sa(dp82
|
||||
Vaddresses
|
||||
p83
|
||||
(lp84
|
||||
sVnetwork
|
||||
p85
|
||||
VStorage
|
||||
p86
|
||||
sVprimary
|
||||
p87
|
||||
I01
|
||||
sVmtu
|
||||
p88
|
||||
I1350
|
||||
sVport_name
|
||||
p89
|
||||
g31
|
||||
sg73
|
||||
(lp90
|
||||
sVroutes
|
||||
p91
|
||||
(lp92
|
||||
sVuse_dhcp
|
||||
p93
|
||||
I00
|
||||
sVtype
|
||||
p94
|
||||
Vinterface
|
||||
p95
|
||||
sVname
|
||||
p96
|
||||
Vnic4
|
||||
p97
|
||||
sa(dp98
|
||||
Vaddresses
|
||||
p99
|
||||
(lp100
|
||||
sVnetwork
|
||||
p101
|
||||
VStorageMgmt
|
||||
p102
|
||||
sVprimary
|
||||
p103
|
||||
I01
|
||||
sVmtu
|
||||
p104
|
||||
I1350
|
||||
sVport_name
|
||||
p105
|
||||
g31
|
||||
sg73
|
||||
(lp106
|
||||
sVroutes
|
||||
p107
|
||||
(lp108
|
||||
sVuse_dhcp
|
||||
p109
|
||||
I00
|
||||
sVtype
|
||||
p110
|
||||
Vinterface
|
||||
p111
|
||||
sVname
|
||||
p112
|
||||
Vnic5
|
||||
p113
|
||||
sasS'controller.yaml'
|
||||
p114
|
||||
(lp115
|
||||
(dp116
|
||||
Vaddresses
|
||||
p117
|
||||
(lp118
|
||||
sVnetwork
|
||||
p119
|
||||
VControlPlane
|
||||
p120
|
||||
sVprimary
|
||||
p121
|
||||
I01
|
||||
sVmtu
|
||||
p122
|
||||
I1350
|
||||
sVport_name
|
||||
p123
|
||||
g31
|
||||
sg73
|
||||
(lp124
|
||||
sVroutes
|
||||
p125
|
||||
(lp126
|
||||
sVuse_dhcp
|
||||
p127
|
||||
I00
|
||||
sVtype
|
||||
p128
|
||||
Vinterface
|
||||
p129
|
||||
sVname
|
||||
p130
|
||||
Vnic1
|
||||
p131
|
||||
sa(dp132
|
||||
Vdns_servers
|
||||
p133
|
||||
V{get_param: DnsServers}
|
||||
p134
|
||||
sVaddresses
|
||||
p135
|
||||
(lp136
|
||||
sVnetwork
|
||||
p137
|
||||
VExternal
|
||||
p138
|
||||
sVmtu
|
||||
p139
|
||||
I-1
|
||||
sg73
|
||||
(lp140
|
||||
(dp141
|
||||
Vaddresses
|
||||
p142
|
||||
(lp143
|
||||
sVnetwork
|
||||
p144
|
||||
VNone
|
||||
p145
|
||||
sVprimary
|
||||
p146
|
||||
I01
|
||||
sVmtu
|
||||
p147
|
||||
I1350
|
||||
sVport_name
|
||||
p148
|
||||
g31
|
||||
sg73
|
||||
(lp149
|
||||
sVroutes
|
||||
p150
|
||||
(lp151
|
||||
sVuse_dhcp
|
||||
p152
|
||||
I00
|
||||
sVtype
|
||||
p153
|
||||
Vinterface
|
||||
p154
|
||||
sVname
|
||||
p155
|
||||
Vnic2
|
||||
p156
|
||||
sasVroutes
|
||||
p157
|
||||
(lp158
|
||||
sVuse_dhcp
|
||||
p159
|
||||
I00
|
||||
sVtype
|
||||
p160
|
||||
Vovs_bridge
|
||||
p161
|
||||
sVname
|
||||
p162
|
||||
Vbr-ex
|
||||
p163
|
||||
sa(dp164
|
||||
Vaddresses
|
||||
p165
|
||||
(lp166
|
||||
sVnetwork
|
||||
p167
|
||||
VInternalApi
|
||||
p168
|
||||
sVprimary
|
||||
p169
|
||||
I01
|
||||
sVmtu
|
||||
p170
|
||||
I1350
|
||||
sVport_name
|
||||
p171
|
||||
g31
|
||||
sg73
|
||||
(lp172
|
||||
sVroutes
|
||||
p173
|
||||
(lp174
|
||||
sVuse_dhcp
|
||||
p175
|
||||
I00
|
||||
sVtype
|
||||
p176
|
||||
Vinterface
|
||||
p177
|
||||
sVname
|
||||
p178
|
||||
Vnic3
|
||||
p179
|
||||
sa(dp180
|
||||
Vaddresses
|
||||
p181
|
||||
(lp182
|
||||
sVnetwork
|
||||
p183
|
||||
VStorage
|
||||
p184
|
||||
sVprimary
|
||||
p185
|
||||
I01
|
||||
sVmtu
|
||||
p186
|
||||
I1350
|
||||
sVport_name
|
||||
p187
|
||||
g31
|
||||
sg73
|
||||
(lp188
|
||||
sVroutes
|
||||
p189
|
||||
(lp190
|
||||
sVuse_dhcp
|
||||
p191
|
||||
I00
|
||||
sVtype
|
||||
p192
|
||||
Vinterface
|
||||
p193
|
||||
sVname
|
||||
p194
|
||||
Vnic4
|
||||
p195
|
||||
sa(dp196
|
||||
Vaddresses
|
||||
p197
|
||||
(lp198
|
||||
sVnetwork
|
||||
p199
|
||||
VStorageMgmt
|
||||
p200
|
||||
sVprimary
|
||||
p201
|
||||
I01
|
||||
sVmtu
|
||||
p202
|
||||
I1350
|
||||
sVport_name
|
||||
p203
|
||||
g31
|
||||
sg73
|
||||
(lp204
|
||||
sVroutes
|
||||
p205
|
||||
(lp206
|
||||
sVuse_dhcp
|
||||
p207
|
||||
I00
|
||||
sVtype
|
||||
p208
|
||||
Vinterface
|
||||
p209
|
||||
sVname
|
||||
p210
|
||||
Vnic5
|
||||
p211
|
||||
sa(dp212
|
||||
Vdns_servers
|
||||
p213
|
||||
V{get_param: DnsServers}
|
||||
p214
|
||||
sVaddresses
|
||||
p215
|
||||
(lp216
|
||||
sVnetwork
|
||||
p217
|
||||
VTenant
|
||||
p218
|
||||
sVmtu
|
||||
p219
|
||||
I-1
|
||||
sg73
|
||||
(lp220
|
||||
(dp221
|
||||
Vaddresses
|
||||
p222
|
||||
(lp223
|
||||
sVnetwork
|
||||
p224
|
||||
VNone
|
||||
p225
|
||||
sVprimary
|
||||
p226
|
||||
I01
|
||||
sVmtu
|
||||
p227
|
||||
I1350
|
||||
sVport_name
|
||||
p228
|
||||
g31
|
||||
sg73
|
||||
(lp229
|
||||
sVroutes
|
||||
p230
|
||||
(lp231
|
||||
sVuse_dhcp
|
||||
p232
|
||||
I00
|
||||
sVtype
|
||||
p233
|
||||
Vinterface
|
||||
p234
|
||||
sVname
|
||||
p235
|
||||
Vnic6
|
||||
p236
|
||||
sasVroutes
|
||||
p237
|
||||
(lp238
|
||||
sVuse_dhcp
|
||||
p239
|
||||
I00
|
||||
sVtype
|
||||
p240
|
||||
Vovs_bridge
|
||||
p241
|
||||
sVname
|
||||
p242
|
||||
Vbr-tenant
|
||||
p243
|
||||
sasS'swift-storage.yaml'
|
||||
p244
|
||||
(lp245
|
||||
sS'compute.yaml'
|
||||
p246
|
||||
(lp247
|
||||
(dp248
|
||||
Vaddresses
|
||||
p249
|
||||
(lp250
|
||||
sVnetwork
|
||||
p251
|
||||
VControlPlane
|
||||
p252
|
||||
sVprimary
|
||||
p253
|
||||
I01
|
||||
sVmtu
|
||||
p254
|
||||
I1350
|
||||
sVport_name
|
||||
p255
|
||||
g31
|
||||
sg73
|
||||
(lp256
|
||||
sVroutes
|
||||
p257
|
||||
(lp258
|
||||
sVuse_dhcp
|
||||
p259
|
||||
I00
|
||||
sVtype
|
||||
p260
|
||||
Vinterface
|
||||
p261
|
||||
sVname
|
||||
p262
|
||||
Vnic1
|
||||
p263
|
||||
sa(dp264
|
||||
Vaddresses
|
||||
p265
|
||||
(lp266
|
||||
sVnetwork
|
||||
p267
|
||||
VInternalApi
|
||||
p268
|
||||
sVprimary
|
||||
p269
|
||||
I01
|
||||
sVmtu
|
||||
p270
|
||||
I1350
|
||||
sVport_name
|
||||
p271
|
||||
g31
|
||||
sg73
|
||||
(lp272
|
||||
sVroutes
|
||||
p273
|
||||
(lp274
|
||||
sVuse_dhcp
|
||||
p275
|
||||
I00
|
||||
sVtype
|
||||
p276
|
||||
Vinterface
|
||||
p277
|
||||
sVname
|
||||
p278
|
||||
Vnic3
|
||||
p279
|
||||
sa(dp280
|
||||
Vaddresses
|
||||
p281
|
||||
(lp282
|
||||
sVnetwork
|
||||
p283
|
||||
VStorage
|
||||
p284
|
||||
sVprimary
|
||||
p285
|
||||
I01
|
||||
sVmtu
|
||||
p286
|
||||
I1350
|
||||
sVport_name
|
||||
p287
|
||||
g31
|
||||
sg73
|
||||
(lp288
|
||||
sVroutes
|
||||
p289
|
||||
(lp290
|
||||
sVuse_dhcp
|
||||
p291
|
||||
I00
|
||||
sVtype
|
||||
p292
|
||||
Vinterface
|
||||
p293
|
||||
sVname
|
||||
p294
|
||||
Vnic4
|
||||
p295
|
||||
sa(dp296
|
||||
Vdns_servers
|
||||
p297
|
||||
V{get_param: DnsServers}
|
||||
p298
|
||||
sVaddresses
|
||||
p299
|
||||
(lp300
|
||||
sVnetwork
|
||||
p301
|
||||
VTenant
|
||||
p302
|
||||
sVmtu
|
||||
p303
|
||||
I-1
|
||||
sg73
|
||||
(lp304
|
||||
(dp305
|
||||
Vaddresses
|
||||
p306
|
||||
(lp307
|
||||
sVnetwork
|
||||
p308
|
||||
VNone
|
||||
p309
|
||||
sVprimary
|
||||
p310
|
||||
I01
|
||||
sVmtu
|
||||
p311
|
||||
I1350
|
||||
sVport_name
|
||||
p312
|
||||
g31
|
||||
sg73
|
||||
(lp313
|
||||
sVroutes
|
||||
p314
|
||||
(lp315
|
||||
sVuse_dhcp
|
||||
p316
|
||||
I00
|
||||
sVtype
|
||||
p317
|
||||
Vinterface
|
||||
p318
|
||||
sVname
|
||||
p319
|
||||
Vnic6
|
||||
p320
|
||||
sasVroutes
|
||||
p321
|
||||
(lp322
|
||||
sVuse_dhcp
|
||||
p323
|
||||
I00
|
||||
sVtype
|
||||
p324
|
||||
Vovs_bridge
|
||||
p325
|
||||
sVname
|
||||
p326
|
||||
Vbr-tenant
|
||||
p327
|
||||
sa(dp328
|
||||
Vaddresses
|
||||
p329
|
||||
(lp330
|
||||
sVnetwork
|
||||
p331
|
||||
VStorageMgmt
|
||||
p332
|
||||
sVprimary
|
||||
p333
|
||||
I01
|
||||
sVmtu
|
||||
p334
|
||||
I1350
|
||||
sVport_name
|
||||
p335
|
||||
g31
|
||||
sg73
|
||||
(lp336
|
||||
sVroutes
|
||||
p337
|
||||
(lp338
|
||||
sVuse_dhcp
|
||||
p339
|
||||
I00
|
||||
sVtype
|
||||
p340
|
||||
Vinterface
|
||||
p341
|
||||
sVname
|
||||
p342
|
||||
Vnic5
|
||||
p343
|
||||
sass.
|
||||
Loading…
Reference in New Issue