Use OS::Heat::Value for NetworkConfig
This removes the run-os-net-config.sh script and uses OS::Heat::Value for the NetworkConfig resources. Depends-On: https://review.opendev.org/#/c/751713/ Change-Id: Ic3a0234d36525cdd6f415c77733d05a39bbeb3c2
This commit is contained in:
Rabi Mishra
parent
2d1e769456
commit
a4622f1382
@ -182,27 +182,21 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -179,30 +179,24 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ctlplane
|
||||
use_dhcp: false
|
||||
ovs_extra:
|
||||
- "br-set-external-id br-ctlplane bridge-id br-ctlplane"
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ctlplane
|
||||
use_dhcp: false
|
||||
ovs_extra:
|
||||
- "br-set-external-id br-ctlplane bridge-id br-ctlplane"
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -89,44 +89,38 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -111,18 +111,12 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config: []
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config: []
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -120,68 +120,62 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
routes:
|
||||
- ip_netmask: ::/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
routes:
|
||||
- ip_netmask: ::/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -115,56 +115,50 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -163,77 +163,71 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: ::/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
routes:
|
||||
- default: true
|
||||
ip_netmask: ::/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -111,18 +111,12 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config: []
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config: []
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -89,43 +89,37 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -89,18 +89,12 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config: []
|
||||
value:
|
||||
network_config: []
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -117,70 +117,63 @@ parameters:
|
||||
description: default route for the external network
|
||||
type: string
|
||||
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -115,55 +115,49 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -163,72 +163,66 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -111,18 +111,12 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config: []
|
||||
value:
|
||||
network_config: []
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -89,43 +89,37 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -111,18 +111,12 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config: []
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config: []
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -115,55 +115,49 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic7
|
||||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
routes:
|
||||
- default: true
|
||||
next_hop: {get_param: ControlPlaneDefaultRoute}
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic7
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -157,80 +157,74 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
ovs_options: {get_param: BondInterfaceOvsOptions}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
primary: false
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic7
|
||||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- type: ovs_bridge
|
||||
name: br-ex
|
||||
dns_servers: {get_param: DnsServers}
|
||||
domain: {get_param: DnsSearchDomains}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop: {get_param: ExternalInterfaceDefaultRoute}
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
ovs_options: {get_param: BondInterfaceOvsOptions}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu: 1350
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu: 1350
|
||||
primary: false
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: InternalApiIpSubnet}
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageIpSubnet}
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu: 1350
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
dns_servers: {get_param: DnsServers}
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask: {get_param: TenantIpSubnet}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic7
|
||||
mtu: 1350
|
||||
primary: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -111,18 +111,12 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$network_config:
|
||||
network_config: []
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
value:
|
||||
network_config: []
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value: {get_resource: OsNetConfigImpl}
|
||||
value: {get_attr: [OsNetConfigImpl, value]}
|
||||
|
||||
@ -74,36 +74,30 @@ parameters:
|
||||
{%- endfor %}
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
use_dhcp: true
|
||||
ovs_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic1
|
||||
- type: interface
|
||||
name: nic2
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
use_dhcp: true
|
||||
ovs_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic1
|
||||
- type: interface
|
||||
name: nic2
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -72,31 +72,25 @@ parameters:
|
||||
{%- endfor %}
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -74,39 +74,33 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: linux_bridge
|
||||
name: bridge_name
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: ControlPlaneIp
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
default: true
|
||||
value:
|
||||
network_config:
|
||||
- type: linux_bridge
|
||||
name: bridge_name
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: ControlPlaneIp
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
routes:
|
||||
- ip_netmask: 0.0.0.0/0
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
default: true
|
||||
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -101,66 +101,57 @@ conditions:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
inputs:
|
||||
- name: disable_configure_safe_defaults
|
||||
default: true
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
value:
|
||||
if:
|
||||
- standalone_net_config_override
|
||||
- {get_param: StandaloneNetConfigOverride}
|
||||
- network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ctlplane
|
||||
mtu: {get_param: InterfaceLocalMtu}
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
ovs_extra:
|
||||
- "br-set-external-id br-ctlplane bridge-id br-ctlplane"
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
-
|
||||
if:
|
||||
- standalone_net_config_override
|
||||
- {get_param: StandaloneNetConfigOverride}
|
||||
- network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ctlplane
|
||||
mtu: {get_param: InterfaceLocalMtu}
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
ovs_extra:
|
||||
- "br-set-external-id br-ctlplane bridge-id br-ctlplane"
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
-
|
||||
if:
|
||||
- control_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [control_virtual_ip_is_ipv6, '128', '32']}
|
||||
-
|
||||
if:
|
||||
- public_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [public_virtual_ip_is_ipv6, '128', '32']}
|
||||
routes: {get_param: ControlPlaneStaticRoutes}
|
||||
members:
|
||||
- type: interface
|
||||
name: {get_param: NeutronPublicInterface}
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
mtu: {get_param: InterfaceLocalMtu}
|
||||
- control_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [control_virtual_ip_is_ipv6, '128', '32']}
|
||||
-
|
||||
if:
|
||||
- public_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [public_virtual_ip_is_ipv6, '128', '32']}
|
||||
routes: {get_param: ControlPlaneStaticRoutes}
|
||||
members:
|
||||
- type: interface
|
||||
name: {get_param: NeutronPublicInterface}
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
mtu: {get_param: InterfaceLocalMtu}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -74,42 +74,36 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
- type: interface
|
||||
name: br-ex:0
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
- default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
- type: interface
|
||||
name: br-ex:0
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
- default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -74,41 +74,35 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
- default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
- default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -73,36 +73,30 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
- default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
- default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr:
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -97,65 +97,55 @@ conditions:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
inputs:
|
||||
- name: disable_configure_safe_defaults
|
||||
default: true
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: network/scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
value:
|
||||
if:
|
||||
- undercloud_net_config_override
|
||||
- {get_param: UndercloudNetConfigOverride}
|
||||
- network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ctlplane
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
ovs_extra:
|
||||
- "br-set-external-id br-ctlplane bridge-id br-ctlplane"
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
-
|
||||
if:
|
||||
- undercloud_net_config_override
|
||||
- {get_param: UndercloudNetConfigOverride}
|
||||
- network_config:
|
||||
- type: ovs_bridge
|
||||
name: br-ctlplane
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
ovs_extra:
|
||||
- "br-set-external-id br-ctlplane bridge-id br-ctlplane"
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
-
|
||||
if:
|
||||
- control_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [control_virtual_ip_is_ipv6, '128', '32']}
|
||||
-
|
||||
if:
|
||||
- public_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [public_virtual_ip_is_ipv6, '128', '32']}
|
||||
routes: {get_param: ControlPlaneStaticRoutes}
|
||||
members:
|
||||
- type: interface
|
||||
name: {get_param: NeutronPublicInterface}
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
mtu: {get_param: UndercloudLocalMtu}
|
||||
- control_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'control_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [control_virtual_ip_is_ipv6, '128', '32']}
|
||||
-
|
||||
if:
|
||||
- public_virtual_ip_unset
|
||||
- {}
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - {get_param: [DeployedServerPortMap, 'public_virtual_ip', fixed_ips, 0, ip_address]}
|
||||
- {if: [public_virtual_ip_is_ipv6, '128', '32']}
|
||||
routes: {get_param: ControlPlaneStaticRoutes}
|
||||
members:
|
||||
- type: interface
|
||||
name: {get_param: NeutronPublicInterface}
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
mtu: {get_param: UndercloudLocalMtu}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -137,157 +137,151 @@ resources:
|
||||
{%- endfor %}
|
||||
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
{%- endif %}
|
||||
- type: linux_bond
|
||||
name: bond_api
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondApi, value]
|
||||
use_dhcp: false
|
||||
bonding_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondApi, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondApi, value]
|
||||
- type: linux_bond
|
||||
name: bond_api
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondApi, value]
|
||||
use_dhcp: false
|
||||
bonding_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondApi, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondApi, value]
|
||||
{%- for network in networks if network.enabled|default(true) and network.name in _role_networks and not network.name.startswith('Tenant') %}
|
||||
- type: vlan
|
||||
device: bond_api
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
- type: vlan
|
||||
device: bond_api
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- if not role.name.startswith('ComputeOvsDpdk') %}
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
members:
|
||||
- type: linux_bond
|
||||
name: bond-data
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondData, value]
|
||||
bonding_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondData, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondData, value]
|
||||
{%- for network in networks if network.name.startswith('Tenant') and network.name in _role_networks and network.enabled|default(true) %}
|
||||
- type: vlan
|
||||
device: bond-data
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
members:
|
||||
- type: linux_bond
|
||||
name: bond-data
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondData, value]
|
||||
bonding_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondData, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu:
|
||||
get_attr: [MinViableMtuBondData, value]
|
||||
{%- for network in networks if network.name.startswith('Tenant') and network.name in _role_networks and network.enabled|default(true) %}
|
||||
- type: vlan
|
||||
device: bond-data
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- else %}
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
use_dhcp: false
|
||||
{%- for network in networks if network.name.startswith('Tenant') and network.name in _role_networks and network.enabled|default(true) %}
|
||||
ovs_extra:
|
||||
- str_replace:
|
||||
template: set port br-dpdk0 tag=_VLAN_TAG_
|
||||
params:
|
||||
_VLAN_TAG_: {get_param: {{network.name}}NetworkVlanID}
|
||||
addresses:
|
||||
- ip_netmask: {get_param: {{network.name}}IpSubnet}
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic4
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
use_dhcp: false
|
||||
{%- for network in networks if network.name.startswith('Tenant') and network.name in _role_networks and network.enabled|default(true) %}
|
||||
ovs_extra:
|
||||
- str_replace:
|
||||
template: set port br-dpdk0 tag=_VLAN_TAG_
|
||||
params:
|
||||
_VLAN_TAG_: {get_param: {{network.name}}NetworkVlanID}
|
||||
addresses:
|
||||
- ip_netmask: {get_param: {{network.name}}IpSubnet}
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic4
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
{%- endif %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -82,99 +82,93 @@ parameters:
|
||||
type: string
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true # NOTE(hjensas): This is the IPv4 default route
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
ovs_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: InternalApiNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: InternalApiIpSubnet
|
||||
routes:
|
||||
get_param: InternalApiInterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: StorageNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageIpSubnet
|
||||
routes:
|
||||
get_param: StorageInterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: StorageMgmtNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageMgmtIpSubnet
|
||||
routes:
|
||||
get_param: StorageMgmtInterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: TenantNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: TenantIpSubnet
|
||||
routes:
|
||||
get_param: TenantInterfaceRoutes
|
||||
# Uncomment when including environments/network-management.yaml
|
||||
# If setting default route on the Management interface, comment
|
||||
# out the default route on the Control Plane.
|
||||
#- type: vlan
|
||||
# vlan_id:
|
||||
# get_param: ManagementNetworkVlanID
|
||||
# addresses:
|
||||
# - ip_netmask:
|
||||
# get_param: ManagementIpSubnet
|
||||
# routes:
|
||||
# list_concat_unique:
|
||||
# - get_param: ManagementInterfaceRoutes
|
||||
# - - default: true
|
||||
# next_hop:
|
||||
# get_param: ManagementInterfaceDefaultRoute
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true # NOTE(hjensas): This is the IPv4 default route
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: true
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
ovs_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: InternalApiNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: InternalApiIpSubnet
|
||||
routes:
|
||||
get_param: InternalApiInterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: StorageNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageIpSubnet
|
||||
routes:
|
||||
get_param: StorageInterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: StorageMgmtNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageMgmtIpSubnet
|
||||
routes:
|
||||
get_param: StorageMgmtInterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: TenantNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: TenantIpSubnet
|
||||
routes:
|
||||
get_param: TenantInterfaceRoutes
|
||||
# Uncomment when including environments/network-management.yaml
|
||||
# If setting default route on the Management interface, comment
|
||||
# out the default route on the Control Plane.
|
||||
#- type: vlan
|
||||
# vlan_id:
|
||||
# get_param: ManagementNetworkVlanID
|
||||
# addresses:
|
||||
# - ip_netmask:
|
||||
# get_param: ManagementIpSubnet
|
||||
# routes:
|
||||
# list_concat_unique:
|
||||
# - get_param: ManagementInterfaceRoutes
|
||||
# - - default: true
|
||||
# next_hop:
|
||||
# get_param: ManagementInterfaceDefaultRoute
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -115,144 +115,138 @@ resources:
|
||||
{%- endfor %}
|
||||
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
{%- endif %}
|
||||
{%- if not role.name.startswith('ComputeOvsDpdk') %}
|
||||
- type: ovs_bridge
|
||||
- type: ovs_bridge
|
||||
{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
|
||||
name: br-bond
|
||||
name: br-bond
|
||||
{%- else %}
|
||||
name: bridge_name
|
||||
name: bridge_name
|
||||
{%- endif %}
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
ovs_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
members:
|
||||
- type: ovs_bond
|
||||
name: bond1
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
ovs_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
{%- for network in networks if network.enabled|default(true) and network.name in _role_networks %}
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- else %}
|
||||
# Linux bond for non-DPDK traffic required when using DPDK
|
||||
- type: linux_bond
|
||||
name: bond_api
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
bonding_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
# Linux bond for non-DPDK traffic required when using DPDK
|
||||
- type: linux_bond
|
||||
name: bond_api
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
bonding_options:
|
||||
get_param: BondInterfaceOvsOptions
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
members:
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
primary: true
|
||||
- type: interface
|
||||
name: nic3
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
{%- for network in networks if network.enabled|default(true) and network.name in _role_networks %}
|
||||
- type: vlan
|
||||
device: bond_api
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
- type: vlan
|
||||
device: bond_api
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
# Used as a provider network with external DHCP
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic4
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
# Used as a provider network with external DHCP
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic4
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
{%- endif %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -79,120 +79,114 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_param: StorageMtu
|
||||
use_dhcp: false
|
||||
- type: vlan
|
||||
device: nic2
|
||||
mtu:
|
||||
get_param: StorageMtu
|
||||
vlan_id:
|
||||
get_param: StorageNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageIpSubnet
|
||||
routes:
|
||||
get_param: StorageInterfaceRoutes
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu:
|
||||
get_param: InternalApiMtu
|
||||
use_dhcp: false
|
||||
- type: vlan
|
||||
device: nic4
|
||||
mtu:
|
||||
get_param: InternalApiMtu
|
||||
vlan_id:
|
||||
get_param: InternalApiNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: InternalApiIpSubnet
|
||||
routes:
|
||||
get_param: InternalApiInterfaceRoutes
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: TenantIpSubnet
|
||||
routes:
|
||||
get_param: TenantInterfaceRoutes
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
# External bridge for DVR (no IP address required)
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
primary: true
|
||||
# Uncomment when including environments/network-management.yaml
|
||||
# If setting default route on the Management interface, comment
|
||||
# out the default route on the Control Plane.
|
||||
#- type: interface
|
||||
# name: nic7
|
||||
# mtu:
|
||||
# get_param: ManagementMtu
|
||||
# use_dhcp: false
|
||||
# addresses:
|
||||
# - ip_netmask:
|
||||
# get_param: ManagementIpSubnet
|
||||
# routes:
|
||||
# list_concat_unique:
|
||||
# - get_param: ManagementInterfaceRoutes
|
||||
# - - default: true
|
||||
# next_hop:
|
||||
# get_param: ManagementInterfaceDefaultRoute
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_param: StorageMtu
|
||||
use_dhcp: false
|
||||
- type: vlan
|
||||
device: nic2
|
||||
mtu:
|
||||
get_param: StorageMtu
|
||||
vlan_id:
|
||||
get_param: StorageNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageIpSubnet
|
||||
routes:
|
||||
get_param: StorageInterfaceRoutes
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu:
|
||||
get_param: InternalApiMtu
|
||||
use_dhcp: false
|
||||
- type: vlan
|
||||
device: nic4
|
||||
mtu:
|
||||
get_param: InternalApiMtu
|
||||
vlan_id:
|
||||
get_param: InternalApiNetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: InternalApiIpSubnet
|
||||
routes:
|
||||
get_param: InternalApiInterfaceRoutes
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: TenantIpSubnet
|
||||
routes:
|
||||
get_param: TenantInterfaceRoutes
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
# External bridge for DVR (no IP address required)
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
primary: true
|
||||
# Uncomment when including environments/network-management.yaml
|
||||
# If setting default route on the Management interface, comment
|
||||
# out the default route on the Control Plane.
|
||||
#- type: interface
|
||||
# name: nic7
|
||||
# mtu:
|
||||
# get_param: ManagementMtu
|
||||
# use_dhcp: false
|
||||
# addresses:
|
||||
# - ip_netmask:
|
||||
# get_param: ManagementIpSubnet
|
||||
# routes:
|
||||
# list_concat_unique:
|
||||
# - get_param: ManagementInterfaceRoutes
|
||||
# - - default: true
|
||||
# next_hop:
|
||||
# get_param: ManagementInterfaceDefaultRoute
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -101,102 +101,96 @@ parameters:
|
||||
{%- endif %}
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
{%- endif %}
|
||||
{%- set nics_used = [1] %}
|
||||
{%- for network in networks if network.enabled|default(true) and network.name not in role.networks_skip_config|default([]) %}
|
||||
{%- if network.name not in ["External", "Tenant"] %}
|
||||
{%- if network.name in _role_networks %}
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
- type: vlan
|
||||
device: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
- type: vlan
|
||||
device: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{#- We need bridge also for ComputeDVR and Computes with OVN #}
|
||||
{%- elif network.name in role.networks or 'external_bridge' in role.tags %}
|
||||
- type: ovs_bridge
|
||||
- type: ovs_bridge
|
||||
{%- if network.name == "External" %}
|
||||
name: bridge_name
|
||||
name: bridge_name
|
||||
{%- else %}
|
||||
name: br-{{network.name_lower}}
|
||||
name: br-{{network.name_lower}}
|
||||
{%- endif %}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
{%- if network.name in _role_networks %}
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
@ -204,28 +198,28 @@ resources:
|
||||
{%- set _ = nics_used.append(loop.index) %}
|
||||
{%- endfor %}
|
||||
{%- if role.name == 'ComputeOvsDpdk' %}
|
||||
# Used as a provider network with external DHCP
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 1}}
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 2}}
|
||||
# Used as a provider network with external DHCP
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 1}}
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 2}}
|
||||
{%- endif %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -79,108 +79,102 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_param: StorageMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageIpSubnet
|
||||
routes:
|
||||
get_param: StorageInterfaceRoutes
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu:
|
||||
get_param: InternalApiMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: InternalApiIpSubnet
|
||||
routes:
|
||||
get_param: InternalApiInterfaceRoutes
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: TenantIpSubnet
|
||||
routes:
|
||||
get_param: TenantInterfaceRoutes
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
# External bridge for DVR (no IP address required)
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
primary: true
|
||||
# Uncomment when including environments/network-management.yaml
|
||||
# If setting default route on the Management interface, comment
|
||||
# out the default route on the Control Plane.
|
||||
#- type: interface
|
||||
# name: nic7
|
||||
# mtu:
|
||||
# get_param: ManagementMtu
|
||||
# use_dhcp: false
|
||||
# addresses:
|
||||
# - ip_netmask:
|
||||
# get_param: ManagementIpSubnet
|
||||
# routes:
|
||||
# list_concat_unique:
|
||||
# - get_param: ManagementInterfaceRoutes
|
||||
# - - default: true
|
||||
# next_hop:
|
||||
# get_param: ManagementInterfaceDefaultRoute
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- type: interface
|
||||
name: nic2
|
||||
mtu:
|
||||
get_param: StorageMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: StorageIpSubnet
|
||||
routes:
|
||||
get_param: StorageInterfaceRoutes
|
||||
- type: interface
|
||||
name: nic4
|
||||
mtu:
|
||||
get_param: InternalApiMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: InternalApiIpSubnet
|
||||
routes:
|
||||
get_param: InternalApiInterfaceRoutes
|
||||
- type: ovs_bridge
|
||||
name: br-tenant
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: TenantIpSubnet
|
||||
routes:
|
||||
get_param: TenantInterfaceRoutes
|
||||
members:
|
||||
- type: interface
|
||||
name: nic5
|
||||
mtu:
|
||||
get_param: TenantMtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
# External bridge for DVR (no IP address required)
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
members:
|
||||
- type: interface
|
||||
name: nic6
|
||||
mtu:
|
||||
get_param: ExternalMtu
|
||||
primary: true
|
||||
# Uncomment when including environments/network-management.yaml
|
||||
# If setting default route on the Management interface, comment
|
||||
# out the default route on the Control Plane.
|
||||
#- type: interface
|
||||
# name: nic7
|
||||
# mtu:
|
||||
# get_param: ManagementMtu
|
||||
# use_dhcp: false
|
||||
# addresses:
|
||||
# - ip_netmask:
|
||||
# get_param: ManagementIpSubnet
|
||||
# routes:
|
||||
# list_concat_unique:
|
||||
# - get_param: ManagementInterfaceRoutes
|
||||
# - - default: true
|
||||
# next_hop:
|
||||
# get_param: ManagementInterfaceDefaultRoute
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -101,120 +101,114 @@ parameters:
|
||||
{%- endif %}
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
value:
|
||||
network_config:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_param: ControlPlaneMtu
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
{%- endif %}
|
||||
{%- set nics_used = [1] %}
|
||||
{%- for network in networks if network.enabled|default(true) and network.name not in role.networks_skip_config|default([]) %}
|
||||
{%- if network.name not in ["External", "Tenant"] %}
|
||||
{%- if network.name in _role_networks %}
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{#- We need bridge also for ComputeDVR and Computes with OVN #}
|
||||
{%- elif network.name in _role_networks or 'external_bridge' in role.tags %}
|
||||
- type: ovs_bridge
|
||||
- type: ovs_bridge
|
||||
{%- if network.name == "External" %}
|
||||
name: bridge_name
|
||||
name: bridge_name
|
||||
{%- else %}
|
||||
name: br-{{network.name_lower}}
|
||||
name: br-{{network.name_lower}}
|
||||
{%- endif %}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
use_dhcp: false
|
||||
{%- if network.name in _role_networks %}
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{loop.index + 1}}
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
use_dhcp: false
|
||||
primary: true
|
||||
{%- endif %}
|
||||
{#- This hack gets around Jinja scope limitations to update nics_used within loop. #}
|
||||
{%- set _ = nics_used.append(loop.index) %}
|
||||
{%- endfor %}
|
||||
{%- if role.name == 'ComputeOvsDpdk' %}
|
||||
# Used as a provider network with external DHCP
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 1}}
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 2}}
|
||||
# Used as a provider network with external DHCP
|
||||
- type: ovs_user_bridge
|
||||
name: br-dpdk0
|
||||
members:
|
||||
- type: ovs_dpdk_bond
|
||||
name: dpdkbond0
|
||||
rx_queue:
|
||||
get_param: NumDpdkInterfaceRxQueues
|
||||
members:
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk0
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 1}}
|
||||
- type: ovs_dpdk_port
|
||||
name: dpdk1
|
||||
members:
|
||||
- type: interface
|
||||
name: nic{{nics_used[-1] + 2}}
|
||||
{%- endif %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -104,75 +104,69 @@ resources:
|
||||
{%- endfor %}
|
||||
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: linux_bridge
|
||||
value:
|
||||
network_config:
|
||||
- type: linux_bridge
|
||||
{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
|
||||
name: br-storage
|
||||
name: br-storage
|
||||
{%- else %}
|
||||
name: bridge_name
|
||||
name: bridge_name
|
||||
{%- endif %}
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
{%- endif %}
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
primary: true
|
||||
members:
|
||||
- type: interface
|
||||
name: interface_name
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
primary: true
|
||||
{%- for network in networks if network.enabled|default(true) and network.name in _role_networks
|
||||
and network.name not in role.networks_skip_config|default([]) %}
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
and network.name not in role.networks_skip_config|default([]) %}
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
|
||||
device: br-storage
|
||||
device: br-storage
|
||||
{%- else %}
|
||||
device: bridge_name
|
||||
device: bridge_name
|
||||
{%- endif %}
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -77,53 +77,47 @@ parameters:
|
||||
|
||||
resources:
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
members:
|
||||
- type: interface
|
||||
name: nic1
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
name: bridge_name
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
members:
|
||||
- type: interface
|
||||
name: nic1
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
{%- for network in networks if network.enabled|default(true) and network.name != 'External' %}
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
get_param: {{network.name}}InterfaceRoutes
|
||||
- type: vlan
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
get_param: {{network.name}}InterfaceRoutes
|
||||
{%- endfor %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
|
||||
@ -104,70 +104,64 @@ resources:
|
||||
{%- endfor %}
|
||||
|
||||
OsNetConfigImpl:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
str_replace:
|
||||
template:
|
||||
get_file: ../../scripts/run-os-net-config.sh
|
||||
params:
|
||||
$network_config:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
value:
|
||||
network_config:
|
||||
- type: ovs_bridge
|
||||
{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
|
||||
name: br-storage
|
||||
name: br-storage
|
||||
{%- else %}
|
||||
name: bridge_name
|
||||
name: bridge_name
|
||||
{%- endif %}
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
use_dhcp: false
|
||||
dns_servers:
|
||||
get_param: DnsServers
|
||||
domain:
|
||||
get_param: DnsSearchDomains
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
list_join:
|
||||
- /
|
||||
- - get_param: ControlPlaneIp
|
||||
- get_param: ControlPlaneSubnetCidr
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: ControlPlaneStaticRoutes
|
||||
{%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: ControlPlaneDefaultRoute
|
||||
{%- endif %}
|
||||
members:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
members:
|
||||
- type: interface
|
||||
name: nic1
|
||||
mtu:
|
||||
get_attr: [MinViableMtu, value]
|
||||
# force the MAC address of the bridge to this interface
|
||||
primary: true
|
||||
{%- for network in networks if network.enabled|default(true) and network.name in _role_networks %}
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
- type: vlan
|
||||
mtu:
|
||||
get_param: {{network.name}}Mtu
|
||||
vlan_id:
|
||||
get_param: {{network.name}}NetworkVlanID
|
||||
addresses:
|
||||
- ip_netmask:
|
||||
get_param: {{network.name}}IpSubnet
|
||||
routes:
|
||||
list_concat_unique:
|
||||
- get_param: {{network.name}}InterfaceRoutes
|
||||
{%- if network.name in role.default_route_networks %}
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
- - default: true
|
||||
next_hop:
|
||||
get_param: {{network.name}}InterfaceDefaultRoute
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
outputs:
|
||||
OS::stack_id:
|
||||
config:
|
||||
description: The OsNetConfigImpl resource.
|
||||
value:
|
||||
get_resource: OsNetConfigImpl
|
||||
get_attr: [OsNetConfigImpl, value]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
$network_config
|
||||
@ -676,7 +676,7 @@ outputs:
|
||||
description: Mapping of hostname to NetworkConfig resource
|
||||
value:
|
||||
map_replace:
|
||||
- HOSTNAME: {get_resource: NetworkConfig}
|
||||
- HOSTNAME: {get_attr: [NetworkConfig, config]}
|
||||
- keys:
|
||||
HOSTNAME: {get_attr:[{{server_resource_name}}, name]}
|
||||
hosts_entry:
|
||||
|
||||
@ -60,8 +60,6 @@ def parse_opts(argv):
|
||||
return opts
|
||||
|
||||
|
||||
# FIXME: This duplicates code from tools/yaml-nic-config-2-script.py, we should
|
||||
# refactor to share the common code
|
||||
def to_commented_yaml(filename):
|
||||
"""Convert comments into 'comments<num>: ...' YAML"""
|
||||
|
||||
@ -106,8 +104,6 @@ def to_commented_yaml(filename):
|
||||
return out_str
|
||||
|
||||
|
||||
# FIXME: This duplicates code from tools/yaml-nic-config-2-script.py, we should
|
||||
# refactor to share the common code
|
||||
def to_normal_yaml(filename):
|
||||
"""Convert back to normal #commented YAML"""
|
||||
|
||||
|
||||
@ -1,294 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import argparse
|
||||
import collections
|
||||
import datetime
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import six
|
||||
import sys
|
||||
import traceback
|
||||
import yaml
|
||||
|
||||
|
||||
def parse_opts(argv):
|
||||
parser = argparse.ArgumentParser(
|
||||
description='Convert an old style NIC config file into the new format '
|
||||
'using run-os-net-config.sh')
|
||||
parser.add_argument('--script-dir', metavar='<script directory>',
|
||||
help="Relative path to run-os-net-config.sh",
|
||||
default="network/scripts/run-os-net-config.sh")
|
||||
parser.add_argument('files', nargs="+", metavar='<file>',
|
||||
help='List of one or more NIC config files to convert')
|
||||
parser.add_argument('--yes',
|
||||
action='store_true',
|
||||
help=("Use --yes to skip the confirmation "
|
||||
"to overwrite the original config file "),
|
||||
)
|
||||
opts = parser.parse_args(argv[1:])
|
||||
|
||||
return opts
|
||||
|
||||
|
||||
def to_commented_yaml(filename):
|
||||
"""Convert comments into 'comments<num>: ...' YAML"""
|
||||
|
||||
out_str = ''
|
||||
last_non_comment_spaces = ''
|
||||
with open(filename, 'r') as f:
|
||||
comment_count = 0
|
||||
for line in f:
|
||||
# skip blank line
|
||||
if line.isspace():
|
||||
continue
|
||||
char_count = 0
|
||||
spaces = ''
|
||||
for char in line:
|
||||
char_count += 1
|
||||
if char == ' ':
|
||||
spaces += ' '
|
||||
next
|
||||
elif char == '#':
|
||||
last_non_comment_spaces = spaces
|
||||
comment_count += 1
|
||||
comment = line[char_count:-1]
|
||||
out_str += "%scomment%i_%i: '%s'\n" % \
|
||||
(last_non_comment_spaces, comment_count, len(spaces),
|
||||
comment)
|
||||
break
|
||||
else:
|
||||
last_non_comment_spaces = spaces
|
||||
out_str += line
|
||||
|
||||
# inline comments check
|
||||
m = re.match(".*:.*#(.*)", line)
|
||||
if m:
|
||||
comment_count += 1
|
||||
out_str += "%s inline_comment%i: '%s'\n" % \
|
||||
(last_non_comment_spaces, comment_count,
|
||||
m.group(1))
|
||||
break
|
||||
|
||||
with open(filename, 'w') as f:
|
||||
f.write(out_str)
|
||||
|
||||
return out_str
|
||||
|
||||
|
||||
def to_normal_yaml(filename):
|
||||
"""Convert back to normal #commented YAML"""
|
||||
|
||||
with open(filename, 'r') as f:
|
||||
data = f.read()
|
||||
|
||||
out_str = ''
|
||||
next_line_break = False
|
||||
for line in data.split('\n'):
|
||||
# get_input not supported by run-os-net-config.sh script
|
||||
line = line.replace('get_input: ', '')
|
||||
|
||||
# normal comments
|
||||
m = re.match(" +comment[0-9]+_([0-9]+): '(.*)'.*", line)
|
||||
# inline comments
|
||||
i = re.match(" +inline_comment[0-9]+: '(.*)'.*", line)
|
||||
|
||||
if m:
|
||||
if next_line_break:
|
||||
out_str += '\n'
|
||||
next_line_break = False
|
||||
for x in range(0, int(m.group(1))):
|
||||
out_str += " "
|
||||
out_str += "#%s\n" % m.group(2)
|
||||
elif i:
|
||||
out_str += " #%s\n" % i.group(1)
|
||||
next_line_break = False
|
||||
else:
|
||||
if next_line_break:
|
||||
out_str += '\n'
|
||||
out_str += line
|
||||
next_line_break = True
|
||||
|
||||
if next_line_break:
|
||||
out_str += '\n'
|
||||
|
||||
with open(filename, 'w') as f:
|
||||
f.write(out_str)
|
||||
|
||||
return out_str
|
||||
|
||||
|
||||
class description(six.text_type):
|
||||
pass
|
||||
|
||||
|
||||
# FIXME: Some of this duplicates code from build_endpoint_map.py, we should
|
||||
# refactor to share the common code
|
||||
class TemplateDumper(yaml.SafeDumper):
|
||||
|
||||
def represent_ordered_dict(self, data):
|
||||
return self.represent_dict(data.items())
|
||||
|
||||
def description_presenter(self, data):
|
||||
if '\n' in data:
|
||||
style = '>'
|
||||
else:
|
||||
style = ''
|
||||
return self.represent_scalar(
|
||||
yaml.resolver.BaseResolver.DEFAULT_SCALAR_TAG, data, style=style)
|
||||
|
||||
|
||||
# We load mappings into OrderedDict to preserve their order
|
||||
class TemplateLoader(yaml.SafeLoader):
|
||||
def construct_mapping(self, node):
|
||||
self.flatten_mapping(node)
|
||||
return collections.OrderedDict(self.construct_pairs(node))
|
||||
|
||||
|
||||
TemplateDumper.add_representer(description,
|
||||
TemplateDumper.description_presenter)
|
||||
|
||||
TemplateDumper.add_representer(collections.OrderedDict,
|
||||
TemplateDumper.represent_ordered_dict)
|
||||
|
||||
|
||||
TemplateLoader.add_constructor(yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG,
|
||||
TemplateLoader.construct_mapping)
|
||||
|
||||
|
||||
def write_template(template, filename=None):
|
||||
with open(filename, 'w') as f:
|
||||
yaml.dump(template, f, TemplateDumper, width=120,
|
||||
default_flow_style=False)
|
||||
|
||||
|
||||
def convert(filename, script_path):
|
||||
print('Converting %s' % filename)
|
||||
try:
|
||||
with open(filename, 'r') as f:
|
||||
tpl = yaml.load(f.read(), Loader=TemplateLoader)
|
||||
except Exception:
|
||||
print(traceback.format_exc())
|
||||
return 0
|
||||
|
||||
for r in (tpl.get('resources', {})).items():
|
||||
if (r[1].get('type') == 'OS::Heat::StructuredConfig' and
|
||||
r[1].get('properties', {}).get('group') == 'os-apply-config' and
|
||||
r[1].get('properties', {}).get('config', {}).get('os_net_config')):
|
||||
new_r = collections.OrderedDict()
|
||||
new_r['type'] = 'OS::Heat::SoftwareConfig'
|
||||
new_r['properties'] = collections.OrderedDict()
|
||||
new_r['properties']['group'] = 'script'
|
||||
old_net_config = r[1].get(
|
||||
'properties', {}).get('config', {}).get('os_net_config')
|
||||
new_config = {'str_replace': collections.OrderedDict()}
|
||||
new_config['str_replace']['template'] = {'get_file': script_path}
|
||||
new_config['str_replace']['params'] = \
|
||||
{'$network_config': old_net_config}
|
||||
new_r['properties']['config'] = new_config
|
||||
tpl['resources'][r[0]] = new_r
|
||||
else:
|
||||
print("No match %s" % r[0])
|
||||
return 0
|
||||
|
||||
# Preserve typical HOT template key ordering
|
||||
od_result = collections.OrderedDict()
|
||||
# Need to bump the HOT version so str_replace supports serializing to json
|
||||
od_result['heat_template_version'] = "rocky"
|
||||
if tpl.get('description'):
|
||||
od_result['description'] = description(tpl['description'])
|
||||
od_result['parameters'] = tpl['parameters']
|
||||
od_result['resources'] = tpl['resources']
|
||||
od_result['outputs'] = tpl['outputs']
|
||||
|
||||
write_template(od_result, filename)
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
def check_old_style(filename):
|
||||
|
||||
with open(filename, 'r') as f:
|
||||
tpl = yaml.load(f.read(), Loader=yaml.SafeLoader)
|
||||
|
||||
if isinstance(tpl.get('resources', {}), dict):
|
||||
for r in (tpl.get('resources', {})).items():
|
||||
if (r[1].get('type') == 'OS::Heat::StructuredConfig' and
|
||||
r[1].get('properties', {}).get('group') == 'os-apply-config' and
|
||||
r[1].get('properties', {}).get('config', {}).get('os_net_config')):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
opts = parse_opts(sys.argv)
|
||||
exit_val = 0
|
||||
num_converted = 0
|
||||
|
||||
for base_path in opts.files:
|
||||
if os.path.isfile(base_path) and base_path.endswith('.yaml'):
|
||||
|
||||
if check_old_style(base_path):
|
||||
|
||||
# Check for script in the user entered (or default) location or in
|
||||
# path relative to NIC config files
|
||||
script_paths = [opts.script_dir]
|
||||
script_paths.append('../../scripts/run-os-net-config.sh')
|
||||
script_paths.append('../network/scripts/run-os-net-config.sh')
|
||||
script_paths.append('/usr/share/openstack-tripleo-heat-templates/'
|
||||
'network/scripts/run-os-net-config.sh')
|
||||
|
||||
script_path = None
|
||||
for p in script_paths:
|
||||
if os.path.isfile(os.path.join(os.path.dirname(base_path), p)):
|
||||
script_path = p
|
||||
break
|
||||
if script_path is None:
|
||||
print("Error couldn't find run-os-net-config.sh relative "
|
||||
"to filename")
|
||||
sys.exit(1)
|
||||
|
||||
print("Using script at %s" % script_path)
|
||||
|
||||
extension = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
|
||||
backup_filename = os.path.realpath(base_path) + '.' + extension
|
||||
|
||||
print('The yaml file will be overwritten and the original saved '
|
||||
'as %s' % backup_filename)
|
||||
if not (opts.yes or
|
||||
input("Overwrite %s? [y/n] " % base_path).lower() == 'y'):
|
||||
print("Skipping file %s" % base_path)
|
||||
continue
|
||||
|
||||
if os.path.exists(backup_filename):
|
||||
print("Backup file already exists, skipping file %s" %
|
||||
base_path)
|
||||
continue
|
||||
|
||||
shutil.copyfile(base_path, backup_filename)
|
||||
|
||||
to_commented_yaml(base_path)
|
||||
num_converted += convert(base_path, script_path)
|
||||
to_normal_yaml(base_path)
|
||||
else:
|
||||
print('File %s is not using old style NIC configuration' %
|
||||
base_path)
|
||||
|
||||
else:
|
||||
print('Unexpected argument %s' % base_path)
|
||||
|
||||
|
||||
if num_converted == 0:
|
||||
exit_val = 1
|
||||
sys.exit(exit_val)
|
||||
Loading…
x
Reference in New Issue
Block a user