commit
65d3a98cbd
|
@ -1,7 +1,3 @@
|
|||
*/nodes.json
|
||||
nodes.json
|
||||
*/env.yaml
|
||||
env.yaml
|
||||
*/controller.yaml
|
||||
controller.yaml
|
||||
bmc_bm_pairs
|
||||
|
|
|
@ -197,3 +197,7 @@ Create the baremetal Heat stack
|
|||
#. The undercloud vm can now be used with something like TripleO
|
||||
to do a baremetal-style deployment to the virtual baremetal instances
|
||||
deployed previously.
|
||||
|
||||
#. If using the full network isolation provided by OS::OVB::BaremetalNetworks
|
||||
then the overcloud can be created with the network templates in
|
||||
the ``network-templates`` directory.
|
||||
|
|
|
@ -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"]
|
|
@ -0,0 +1,27 @@
|
|||
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
|
||||
# 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
|
||||
# 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,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}
|
|
@ -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}
|
|
@ -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: 1400
|
||||
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: 1400
|
||||
name: nic3
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
mtu: 1400
|
||||
name: nic4
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
dns_servers: {get_param: DnsServers}
|
||||
members:
|
||||
- name: nic6
|
||||
primary: true
|
||||
type: interface
|
||||
mtu: 1400
|
||||
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,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: 1400
|
||||
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: 1400
|
||||
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: 1400
|
||||
name: nic3
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
mtu: 1400
|
||||
name: nic4
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
mtu: 1400
|
||||
name: nic5
|
||||
type: interface
|
||||
use_dhcp: false
|
||||
- addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
dns_servers: {get_param: DnsServers}
|
||||
members:
|
||||
- mtu: 1400
|
||||
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}
|
|
@ -0,0 +1,545 @@
|
|||
(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
|
||||
sS'controller.yaml'
|
||||
p62
|
||||
(lp63
|
||||
(dp64
|
||||
Vaddresses
|
||||
p65
|
||||
(lp66
|
||||
sVnetwork
|
||||
p67
|
||||
VControlPlane
|
||||
p68
|
||||
sVprimary
|
||||
p69
|
||||
I01
|
||||
sVmtu
|
||||
p70
|
||||
I1400
|
||||
sS'members'
|
||||
p71
|
||||
(lp72
|
||||
sVroutes
|
||||
p73
|
||||
(lp74
|
||||
sVuse_dhcp
|
||||
p75
|
||||
I00
|
||||
sVtype
|
||||
p76
|
||||
Vinterface
|
||||
p77
|
||||
sVname
|
||||
p78
|
||||
Vnic1
|
||||
p79
|
||||
sa(dp80
|
||||
Vdns_servers
|
||||
p81
|
||||
V{get_param: DnsServers}
|
||||
p82
|
||||
sVaddresses
|
||||
p83
|
||||
(lp84
|
||||
sVnetwork
|
||||
p85
|
||||
VExternal
|
||||
p86
|
||||
sVmtu
|
||||
p87
|
||||
I-1
|
||||
sg71
|
||||
(lp88
|
||||
(dp89
|
||||
Vaddresses
|
||||
p90
|
||||
(lp91
|
||||
sVnetwork
|
||||
p92
|
||||
VNone
|
||||
p93
|
||||
sVprimary
|
||||
p94
|
||||
I01
|
||||
sVmtu
|
||||
p95
|
||||
I1400
|
||||
sg71
|
||||
(lp96
|
||||
sVroutes
|
||||
p97
|
||||
(lp98
|
||||
sVuse_dhcp
|
||||
p99
|
||||
I00
|
||||
sVtype
|
||||
p100
|
||||
Vinterface
|
||||
p101
|
||||
sVname
|
||||
p102
|
||||
Vnic2
|
||||
p103
|
||||
sasVroutes
|
||||
p104
|
||||
(lp105
|
||||
sVuse_dhcp
|
||||
p106
|
||||
I00
|
||||
sVtype
|
||||
p107
|
||||
Vovs_bridge
|
||||
p108
|
||||
sVname
|
||||
p109
|
||||
Vbr-ex
|
||||
p110
|
||||
sa(dp111
|
||||
Vaddresses
|
||||
p112
|
||||
(lp113
|
||||
sVnetwork
|
||||
p114
|
||||
VInternalApi
|
||||
p115
|
||||
sVprimary
|
||||
p116
|
||||
I01
|
||||
sVmtu
|
||||
p117
|
||||
I1400
|
||||
sg71
|
||||
(lp118
|
||||
sVroutes
|
||||
p119
|
||||
(lp120
|
||||
sVuse_dhcp
|
||||
p121
|
||||
I00
|
||||
sVtype
|
||||
p122
|
||||
Vinterface
|
||||
p123
|
||||
sVname
|
||||
p124
|
||||
Vnic3
|
||||
p125
|
||||
sa(dp126
|
||||
Vaddresses
|
||||
p127
|
||||
(lp128
|
||||
sVnetwork
|
||||
p129
|
||||
VStorage
|
||||
p130
|
||||
sVprimary
|
||||
p131
|
||||
I01
|
||||
sVmtu
|
||||
p132
|
||||
I1400
|
||||
sg71
|
||||
(lp133
|
||||
sVroutes
|
||||
p134
|
||||
(lp135
|
||||
sVuse_dhcp
|
||||
p136
|
||||
I00
|
||||
sVtype
|
||||
p137
|
||||
Vinterface
|
||||
p138
|
||||
sVname
|
||||
p139
|
||||
Vnic4
|
||||
p140
|
||||
sa(dp141
|
||||
Vaddresses
|
||||
p142
|
||||
(lp143
|
||||
sVnetwork
|
||||
p144
|
||||
VStorageMgmt
|
||||
p145
|
||||
sVprimary
|
||||
p146
|
||||
I01
|
||||
sVmtu
|
||||
p147
|
||||
I1400
|
||||
sg71
|
||||
(lp148
|
||||
sVroutes
|
||||
p149
|
||||
(lp150
|
||||
sVuse_dhcp
|
||||
p151
|
||||
I00
|
||||
sVtype
|
||||
p152
|
||||
Vinterface
|
||||
p153
|
||||
sVname
|
||||
p154
|
||||
Vnic5
|
||||
p155
|
||||
sa(dp156
|
||||
Vdns_servers
|
||||
p157
|
||||
V{get_param: DnsServers}
|
||||
p158
|
||||
sVaddresses
|
||||
p159
|
||||
(lp160
|
||||
sVnetwork
|
||||
p161
|
||||
VTenant
|
||||
p162
|
||||
sVmtu
|
||||
p163
|
||||
I-1
|
||||
sg71
|
||||
(lp164
|
||||
(dp165
|
||||
Vaddresses
|
||||
p166
|
||||
(lp167
|
||||
sVnetwork
|
||||
p168
|
||||
VNone
|
||||
p169
|
||||
sVprimary
|
||||
p170
|
||||
I01
|
||||
sVmtu
|
||||
p171
|
||||
I1400
|
||||
sg71
|
||||
(lp172
|
||||
sVroutes
|
||||
p173
|
||||
(lp174
|
||||
sVuse_dhcp
|
||||
p175
|
||||
I00
|
||||
sVtype
|
||||
p176
|
||||
Vinterface
|
||||
p177
|
||||
sVname
|
||||
p178
|
||||
Vnic6
|
||||
p179
|
||||
sasVroutes
|
||||
p180
|
||||
(lp181
|
||||
sVuse_dhcp
|
||||
p182
|
||||
I00
|
||||
sVtype
|
||||
p183
|
||||
Vovs_bridge
|
||||
p184
|
||||
sVname
|
||||
p185
|
||||
Vbr-tenant
|
||||
p186
|
||||
sasS'swift-storage.yaml'
|
||||
p187
|
||||
(lp188
|
||||
sS'compute.yaml'
|
||||
p189
|
||||
(lp190
|
||||
(dp191
|
||||
Vaddresses
|
||||
p192
|
||||
(lp193
|
||||
sVnetwork
|
||||
p194
|
||||
VControlPlane
|
||||
p195
|
||||
sVprimary
|
||||
p196
|
||||
I01
|
||||
sVmtu
|
||||
p197
|
||||
I1400
|
||||
sg71
|
||||
(lp198
|
||||
sVroutes
|
||||
p199
|
||||
(lp200
|
||||
sVuse_dhcp
|
||||
p201
|
||||
I00
|
||||
sVtype
|
||||
p202
|
||||
Vinterface
|
||||
p203
|
||||
sVname
|
||||
p204
|
||||
Vnic1
|
||||
p205
|
||||
sa(dp206
|
||||
Vaddresses
|
||||
p207
|
||||
(lp208
|
||||
sVnetwork
|
||||
p209
|
||||
VInternalApi
|
||||
p210
|
||||
sVprimary
|
||||
p211
|
||||
I01
|
||||
sVmtu
|
||||
p212
|
||||
I1400
|
||||
sg71
|
||||
(lp213
|
||||
sVroutes
|
||||
p214
|
||||
(lp215
|
||||
sVuse_dhcp
|
||||
p216
|
||||
I00
|
||||
sVtype
|
||||
p217
|
||||
Vinterface
|
||||
p218
|
||||
sVname
|
||||
p219
|
||||
Vnic3
|
||||
p220
|
||||
sa(dp221
|
||||
Vaddresses
|
||||
p222
|
||||
(lp223
|
||||
sVnetwork
|
||||
p224
|
||||
VStorage
|
||||
p225
|
||||
sVprimary
|
||||
p226
|
||||
I01
|
||||
sVmtu
|
||||
p227
|
||||
I1400
|
||||
sg71
|
||||
(lp228
|
||||
sVroutes
|
||||
p229
|
||||
(lp230
|
||||
sVuse_dhcp
|
||||
p231
|
||||
I00
|
||||
sVtype
|
||||
p232
|
||||
Vinterface
|
||||
p233
|
||||
sVname
|
||||
p234
|
||||
Vnic4
|
||||
p235
|
||||
sa(dp236
|
||||
Vdns_servers
|
||||
p237
|
||||
V{get_param: DnsServers}
|
||||
p238
|
||||
sVaddresses
|
||||
p239
|
||||
(lp240
|
||||
sVnetwork
|
||||
p241
|
||||
VTenant
|
||||
p242
|
||||
sVmtu
|
||||
p243
|
||||
I1400
|
||||
sg71
|
||||
(lp244
|
||||
(dp245
|
||||
Vaddresses
|
||||
p246
|
||||
(lp247
|
||||
sVnetwork
|
||||
p248
|
||||
VNone
|
||||
p249
|
||||
sVprimary
|
||||
p250
|
||||
I01
|
||||
sVmtu
|
||||
p251
|
||||
I-1
|
||||
sg71
|
||||
(lp252
|
||||
sVroutes
|
||||
p253
|
||||
(lp254
|
||||
sVuse_dhcp
|
||||
p255
|
||||
I00
|
||||
sVtype
|
||||
p256
|
||||
Vinterface
|
||||
p257
|
||||
sVname
|
||||
p258
|
||||
Vnic6
|
||||
p259
|
||||
sasVroutes
|
||||
p260
|
||||
(lp261
|
||||
sVuse_dhcp
|
||||
p262
|
||||
I00
|
||||
sVtype
|
||||
p263
|
||||
Vovs_bridge
|
||||
p264
|
||||
sVname
|
||||
p265
|
||||
Vbr-tenant
|
||||
p266
|
||||
sass.
|
|
@ -0,0 +1,111 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
# Template which creates all networks required for full network isloation.
|
||||
|
||||
parameters:
|
||||
|
||||
overcloud_internal_net:
|
||||
type: string
|
||||
description: Name of internal API network
|
||||
default: overcloud_internal_net
|
||||
|
||||
overcloud_internal_net_cidr:
|
||||
type: string
|
||||
description: CIDR for internal API network subnet
|
||||
default: 172.17.0.0/24
|
||||
|
||||
overcloud_storage_net:
|
||||
type: string
|
||||
description: Name of storage network
|
||||
default: overcloud_storage_net
|
||||
|
||||
overcloud_storage_net_cidr:
|
||||
type: string
|
||||
description: CIDR for storage network subnet
|
||||
default: 172.18.0.0/24
|
||||
|
||||
overcloud_storage_mgmt_net:
|
||||
type: string
|
||||
description: Name of storage management network
|
||||
default: overcloud_storage_mgmt_net
|
||||
|
||||
overcloud_storage_mgmt_net_cidr:
|
||||
type: string
|
||||
description: CIDR for storage management network subnet
|
||||
default: 172.19.0.0/24
|
||||
|
||||
overcloud_tenant_net:
|
||||
type: string
|
||||
description: Name of tenant network
|
||||
default: overcloud_tenant_net
|
||||
|
||||
overcloud_tenant_net_cidr:
|
||||
type: string
|
||||
description: CIDR for tenant network subnet
|
||||
default: 172.16.0.0/24
|
||||
|
||||
resources:
|
||||
|
||||
internal_network:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: {get_param: overcloud_internal_net}
|
||||
|
||||
internal_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network: {get_resource: internal_network}
|
||||
name: {get_param: overcloud_internal_net}
|
||||
cidr: {get_param: overcloud_internal_net_cidr}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
|
||||
storage_network:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: {get_param: overcloud_storage_net}
|
||||
|
||||
storage_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network: {get_resource: storage_network}
|
||||
name: {get_param: overcloud_storage_net}
|
||||
cidr: {get_param: overcloud_storage_net_cidr}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
|
||||
storage_mgmt_network:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: {get_param: overcloud_storage_mgmt_net}
|
||||
|
||||
storage_mgmt_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network: {get_resource: storage_mgmt_network}
|
||||
name: {get_param: overcloud_storage_mgmt_net}
|
||||
cidr: {get_param: overcloud_storage_mgmt_net_cidr}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
|
||||
tenant_network:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: {get_param: overcloud_tenant_net}
|
||||
|
||||
tenant_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network: {get_resource: tenant_network}
|
||||
name: {get_param: overcloud_tenant_net}
|
||||
cidr: {get_param: overcloud_tenant_net_cidr}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
|
||||
outputs:
|
||||
networks:
|
||||
value:
|
||||
internal_net: {get_resource: internal_network}
|
||||
storage_net: {get_resource: storage_network}
|
||||
storage_mgmt_net: {get_resource: storage_mgmt_network}
|
||||
tenant_net: {get_resource: tenant_network}
|
|
@ -0,0 +1,5 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
outputs:
|
||||
networks:
|
||||
value: {}
|
|
@ -0,0 +1,114 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
parameters:
|
||||
|
||||
baremetal_prefix:
|
||||
type: string
|
||||
|
||||
provision_net:
|
||||
type: string
|
||||
|
||||
public_net:
|
||||
type: string
|
||||
description: Name of external network
|
||||
default: public
|
||||
|
||||
suffix:
|
||||
type: string
|
||||
|
||||
overcloud_internal_net:
|
||||
type: string
|
||||
description: Name of internal API network
|
||||
default: overcloud_internal_net
|
||||
|
||||
overcloud_storage_net:
|
||||
type: string
|
||||
description: Name of storage network
|
||||
default: overcloud_storage_net
|
||||
|
||||
overcloud_storage_mgmt_net:
|
||||
type: string
|
||||
description: Name of storage management network
|
||||
default: overcloud_storage_mgmt_net
|
||||
|
||||
overcloud_tenant_net:
|
||||
type: string
|
||||
description: Name of tenant network
|
||||
default: overcloud_tenant_net
|
||||
|
||||
resources:
|
||||
|
||||
provision_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: provision_net}
|
||||
|
||||
internal_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - internal_
|
||||
- {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: overcloud_internal_net}
|
||||
|
||||
storage_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - storage_
|
||||
- {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: overcloud_storage_net}
|
||||
|
||||
storage_mgmt_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - storage_mgmt_
|
||||
- {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: overcloud_storage_mgmt_net}
|
||||
|
||||
tenant_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - tenant_
|
||||
- {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: overcloud_tenant_net}
|
||||
|
||||
public_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - public_
|
||||
- {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: public_net}
|
||||
|
||||
outputs:
|
||||
ports:
|
||||
value:
|
||||
- {port: {get_resource: provision_port}}
|
||||
- {port: {get_resource: public_port}}
|
||||
- {port: {get_resource: internal_port}}
|
||||
- {port: {get_resource: storage_port}}
|
||||
- {port: {get_resource: storage_mgmt_port}}
|
||||
- {port: {get_resource: tenant_port}}
|
|
@ -0,0 +1,34 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
parameters:
|
||||
|
||||
baremetal_prefix:
|
||||
type: string
|
||||
|
||||
provision_net:
|
||||
type: string
|
||||
|
||||
public_net:
|
||||
type: string
|
||||
description: Name of external network
|
||||
default: public
|
||||
|
||||
suffix:
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
provision_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: provision_net}
|
||||
|
||||
outputs:
|
||||
ports:
|
||||
value:
|
||||
- {port: {get_resource: provision_port}}
|
|
@ -20,19 +20,23 @@ parameters:
|
|||
undercloud_flavor: m1.large
|
||||
external_net: external
|
||||
|
||||
# Uncomment and customize the following to use an existing floating ip
|
||||
# parameter_defaults:
|
||||
# undercloud_floating_ip_id: 'uuid of floating ip'
|
||||
# undercloud_floating_ip: 'address of floating ip'
|
||||
#
|
||||
# resource_registry:
|
||||
# OS::OVB::UndercloudFloating: templates/undercloud-floating-existing.yaml
|
||||
#parameter_defaults:
|
||||
## Uncomment and customize the following to use an existing floating ip
|
||||
# undercloud_floating_ip_id: 'uuid of floating ip'
|
||||
# undercloud_floating_ip: 'address of floating ip'
|
||||
|
||||
#resource_registry:
|
||||
## Uncomment the following to use an existing floating ip
|
||||
# OS::OVB::UndercloudFloating: templates/undercloud-floating-existing.yaml
|
||||
|
||||
# Uncomment the following to use no floating ip
|
||||
# resource_registry:
|
||||
## Uncomment the following to use no floating ip
|
||||
# OS::OVB::UndercloudFloating: templates/undercloud-floating-none.yaml
|
||||
|
||||
# Uncomment the following to create a private network
|
||||
# resource_registry:
|
||||
## Uncomment the following to create a private network
|
||||
# OS::OVB::PrivateNetwork: templates/private-net-create.yaml
|
||||
|
||||
## Uncomment to create all networks required for network-isolation.
|
||||
## parameter_defaults should be used to override default parameter values
|
||||
## in baremetal-networks-all.yaml
|
||||
# OS::OVB::BaremetalNetworks: templates/baremetal-networks-all.yaml
|
||||
# OS::OVB::BaremetalPorts: templates/baremetal-ports-all.yaml
|
||||
|
|
|
@ -45,10 +45,21 @@ parameters:
|
|||
type: string
|
||||
default: provision
|
||||
|
||||
provision_net_cidr:
|
||||
type: string
|
||||
description: CIDR for provision network subnet
|
||||
default: 192.0.2.0/24
|
||||
|
||||
public_net:
|
||||
type: string
|
||||
description: Name of the overcloud external network
|
||||
default: public
|
||||
|
||||
public_net_cidr:
|
||||
type: string
|
||||
description: CIDR for external network subnet
|
||||
default: 10.0.0.0/24
|
||||
|
||||
bmc_prefix:
|
||||
type: string
|
||||
default: bmc
|
||||
|
@ -104,7 +115,7 @@ resources:
|
|||
properties:
|
||||
network: {get_resource: provision_network}
|
||||
name: provision-subnet
|
||||
cidr: 192.0.2.0/24
|
||||
cidr: {get_param: provision_net_cidr}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
|
||||
|
@ -117,8 +128,8 @@ resources:
|
|||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network: {get_resource: public_network}
|
||||
name: public-subnet
|
||||
cidr: 10.0.0.0/24
|
||||
name: {get_param: public_net}
|
||||
cidr: {get_param: public_net_cidr}
|
||||
gateway_ip: null
|
||||
enable_dhcp: false
|
||||
|
||||
|
@ -151,6 +162,7 @@ resources:
|
|||
|
||||
undercloud_server:
|
||||
type: OS::Nova::Server
|
||||
depends_on: [provision_subnet, public_subnet]
|
||||
properties:
|
||||
flavor: {get_param: undercloud_flavor}
|
||||
image: {get_param: undercloud_image}
|
||||
|
@ -181,6 +193,7 @@ resources:
|
|||
|
||||
baremetal_env:
|
||||
type: OS::OVB::BaremetalEnvironment
|
||||
depends_on: [provision_subnet, public_subnet]
|
||||
properties:
|
||||
baremetal_flavor: {get_param: baremetal_flavor}
|
||||
baremetal_image: {get_param: baremetal_image}
|
||||
|
|
|
@ -3,3 +3,5 @@ resource_registry:
|
|||
OS::OVB::BaremetalEnvironment: virtual-baremetal.yaml
|
||||
OS::OVB::UndercloudFloating: undercloud-floating.yaml
|
||||
OS::OVB::PrivateNetwork: private-net-existing.yaml
|
||||
OS::OVB::BaremetalNetworks: baremetal-networks-none.yaml
|
||||
OS::OVB::BaremetalPorts: baremetal-ports-default.yaml
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
parameters:
|
||||
bmc_flavor:
|
||||
type: string
|
||||
|
||||
bmc_image:
|
||||
type: string
|
||||
|
||||
baremetal_flavor:
|
||||
type: string
|
||||
|
@ -16,67 +11,27 @@ parameters:
|
|||
key_name:
|
||||
type: string
|
||||
|
||||
bmc_prefix:
|
||||
type: string
|
||||
|
||||
baremetal_prefix:
|
||||
type: string
|
||||
|
||||
public_net:
|
||||
type: string
|
||||
|
||||
public_sg:
|
||||
type: string
|
||||
|
||||
private_net:
|
||||
type: string
|
||||
|
||||
private_sg:
|
||||
type: string
|
||||
|
||||
provision_net:
|
||||
type: string
|
||||
|
||||
provision_sg:
|
||||
public_net:
|
||||
type: string
|
||||
|
||||
suffix:
|
||||
type: string
|
||||
|
||||
os_user:
|
||||
type: string
|
||||
|
||||
os_password:
|
||||
type: string
|
||||
hidden: true
|
||||
|
||||
os_tenant:
|
||||
type: string
|
||||
|
||||
os_auth_url:
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
bmc_port:
|
||||
type: OS::Neutron::Port
|
||||
baremetal_ports:
|
||||
type: OS::OVB::BaremetalPorts
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: bmc_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: private_net}
|
||||
|
||||
baremetal_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: baremetal_prefix}
|
||||
- {get_param: suffix}
|
||||
network: {get_param: provision_net}
|
||||
suffix: {get_param: suffix}
|
||||
baremetal_prefix: {get_param: baremetal_prefix}
|
||||
provision_net: {get_param: provision_net}
|
||||
public_net: {get_param: public_net}
|
||||
|
||||
baremetal_server:
|
||||
type: OS::Nova::Server
|
||||
|
@ -85,12 +40,7 @@ resources:
|
|||
image: {get_param: baremetal_image}
|
||||
config_drive: false
|
||||
key_name: {get_param: key_name}
|
||||
# security_groups:
|
||||
# TODO(bnemec): Reattach these when it doesn't wreak havoc on TripleO to have multiple nics.
|
||||
#- {get_param: public_sg}
|
||||
networks:
|
||||
- port: {get_resource: baremetal_port}
|
||||
#- network: {get_param: public_net}
|
||||
networks: {get_attr: [baremetal_ports, ports]}
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
|
|
|
@ -70,26 +70,6 @@ parameters:
|
|||
type: string
|
||||
default: all_sg
|
||||
|
||||
# Ignored parameters for compatibility with QuintupleO env files
|
||||
undercloud_image:
|
||||
type: string
|
||||
default: ''
|
||||
undercloud_flavor:
|
||||
type: string
|
||||
default: ''
|
||||
undercloud_name:
|
||||
type: string
|
||||
default: ''
|
||||
external_net:
|
||||
type: string
|
||||
default: ''
|
||||
public_net_name:
|
||||
type: string
|
||||
default: ''
|
||||
provision_net_name:
|
||||
type: string
|
||||
default: ''
|
||||
|
||||
resources:
|
||||
# NOTE(bnemec): This should probably be limited to allowing only
|
||||
# OpenStack API ports, but for now this is simpler and not
|
||||
|
@ -118,6 +98,20 @@ resources:
|
|||
- {get_param: bmc_prefix}
|
||||
network: {get_param: private_net}
|
||||
|
||||
bmc_other_ports:
|
||||
type: OS::Heat::ResourceGroup
|
||||
properties:
|
||||
count: {get_param: node_count}
|
||||
resource_def:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
name:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: bmc_prefix}
|
||||
- _%index%
|
||||
network: {get_param: private_net}
|
||||
|
||||
bmc_server:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
|
@ -143,28 +137,21 @@ resources:
|
|||
$openstackbmc_script: {get_file: ../bin/openstackbmc}
|
||||
template: {get_file: ../bin/install_openstackbmc.sh}
|
||||
|
||||
baremetal_networks:
|
||||
type: OS::OVB::BaremetalNetworks
|
||||
|
||||
openstack_baremetal_servers:
|
||||
type: OS::Heat::ResourceGroup
|
||||
depends_on: baremetal_networks
|
||||
properties:
|
||||
count: {get_param: node_count}
|
||||
resource_def:
|
||||
type: OS::OVB::ServerPair
|
||||
properties:
|
||||
bmc_flavor: {get_param: bmc_flavor}
|
||||
bmc_image: {get_param: bmc_image}
|
||||
baremetal_flavor: {get_param: baremetal_flavor}
|
||||
baremetal_image: {get_param: baremetal_image}
|
||||
key_name: {get_param: key_name}
|
||||
public_net: {get_param: public_net}
|
||||
public_sg: {get_param: default_sg}
|
||||
private_net: {get_param: private_net}
|
||||
private_sg: {get_resource: private_sg}
|
||||
provision_net: {get_param: provision_net}
|
||||
provision_sg: {get_param: default_sg}
|
||||
public_net: {get_param: public_net}
|
||||
suffix: _%index%
|
||||
bmc_prefix: {get_param: bmc_prefix}
|
||||
baremetal_prefix: {get_param: baremetal_prefix}
|
||||
os_user: {get_param: os_user}
|
||||
os_password: {get_param: os_password}
|
||||
os_tenant: {get_param: os_tenant}
|
||||
os_auth_url: {get_param: os_auth_url}
|
||||
|
|
Loading…
Reference in New Issue