19f0fe7665
This change adds a system management network to all overcloud
nodes. The purpose of this network is for system administration,
for access to infrastructure services like DNS or NTP, or for
monitoring. This allows the management network to be placed on a
bond for redundancy, or for the system management network to be
an out-of-band network with no routing in or out. The management
network might also be configured as a default route instead of the
provisioning 'ctlplane' network.
This change does not enable the management network by default. An
environment file named network-management.yaml may be included to
enable the network and ports for each role. The included NIC config
templates have been updated with a block that may be uncommented
when the management network is enabled.
This change also contains some minor cleanup to the NIC templates,
particularly the multiple nic templates.
Change-Id: I0813a13f60a4f797be04b34258a2cffa9ea7e84f
(cherry picked from commit 15bb67261a)
74 lines
2.0 KiB
YAML
74 lines
2.0 KiB
YAML
heat_template_version: 2015-04-30
|
|
|
|
description: >
|
|
Software Config to drive os-net-config with 2 bonded nics on a bridge.
|
|
|
|
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:
|
|
default: ''
|
|
description: IP address/subnet on the management network
|
|
type: string
|
|
|
|
resources:
|
|
OsNetConfigImpl:
|
|
type: OS::Heat::StructuredConfig
|
|
properties:
|
|
group: os-apply-config
|
|
config:
|
|
os_net_config:
|
|
network_config:
|
|
-
|
|
type: ovs_bridge
|
|
name: {get_input: bridge_name}
|
|
use_dhcp: true
|
|
# Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284
|
|
#ovs_extra:
|
|
# - list_join:
|
|
# - ' '
|
|
# - - br-set-external-id
|
|
# - {get_input: bridge_name}
|
|
# - bridge-id
|
|
# - {get_input: bridge_name}
|
|
members:
|
|
-
|
|
type: ovs_bond
|
|
name: bond1
|
|
use_dhcp: true
|
|
members:
|
|
# os-net-config translates nic1 => em1 (for example)
|
|
-
|
|
type: interface
|
|
name: nic1
|
|
-
|
|
type: interface
|
|
name: nic2
|
|
|
|
outputs:
|
|
OS::stack_id:
|
|
description: The OsNetConfigImpl resource.
|
|
value: {get_resource: OsNetConfigImpl}
|