openstack
/
openstack-virtual-baremetal
Code Issues Proposed changes

Regenerate net-iso templates with latest tool 

This is a noop change that just reorders the yaml into a more
readable form.
This commit is contained in:
Ben Nemec 2016-10-21 10:34:56 -05:00
parent c15d12a8e5
commit 5deb87eb2d
9 changed files with 240 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bond-network-templates/nic-configs/ceph-storage.yaml
View File

@ -83,33 +83,33 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
- type: interface
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
mtu: 1350
name: nic5
type: interface
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: interface
name: nic5
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
group: os-apply-config
type: OS::Heat::StructuredConfig

44
bond-network-templates/nic-configs/compute.yaml
View File

@ -83,44 +83,44 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
mtu: 1350
- type: interface
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
- type: interface
name: nic5
type: interface
mtu: 1350
use_dhcp: false
- addresses:
- ip_netmask: {get_param: TenantIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic7
primary: true
type: interface
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: ovs_bridge
name: br-tenant
type: ovs_bridge
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: TenantIpSubnet}
members:
- type: interface
name: nic7
mtu: 1350
primary: true
group: os-apply-config
type: OS::Heat::StructuredConfig

100
bond-network-templates/nic-configs/controller.yaml
View File

@ -83,70 +83,70 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: ExternalIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- members:
- mtu: 1350
name: nic2
primary: true
type: interface
- mtu: 1350
name: nic3
primary: false
type: interface
name: bond1
ovs_options: {get_param: BondInterfaceOvsOptions}
type: ovs_bond
- type: ovs_bridge
name: br-ex
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: ExternalIpSubnet}
routes:
- ip_netmask: 0.0.0.0/0
next_hop: {get_param: ExternalInterfaceDefaultRoute}
type: ovs_bridge
use_dhcp: false
- addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
mtu: 1350
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
name: nic5
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
mtu: 1350
name: nic6
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: TenantIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic7
primary: true
type: interface
name: br-tenant
type: ovs_bridge
- 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
group: os-apply-config
type: OS::Heat::StructuredConfig

28
ipv6-network-templates/nic-configs/ceph-storage.yaml
View File

@ -83,34 +83,34 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- default: true
ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
- type: interface
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
mtu: 1350
name: nic5
type: interface
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: interface
name: nic5
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
group: os-apply-config
type: OS::Heat::StructuredConfig

44
ipv6-network-templates/nic-configs/compute.yaml
View File

@ -83,45 +83,45 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- default: true
ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
mtu: 1350
- type: interface
name: nic3
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
- type: interface
name: nic4
type: interface
mtu: 1350
use_dhcp: false
- addresses:
- ip_netmask: {get_param: TenantIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic6
primary: true
type: interface
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: ovs_bridge
name: br-tenant
type: ovs_bridge
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: TenantIpSubnet}
members:
- type: interface
name: nic6
mtu: 1350
primary: true
group: os-apply-config
type: OS::Heat::StructuredConfig

82
ipv6-network-templates/nic-configs/controller.yaml
View File

@ -83,66 +83,66 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- default: true
ip_netmask: 0.0.0.0/0
next_hop: {get_param: ControlPlaneDefaultRoute}
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: ExternalIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic2
primary: true
type: interface
- type: ovs_bridge
name: br-ex
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: ExternalIpSubnet}
routes:
- default: true
ip_netmask: 0.0.0.0/0
next_hop: {get_param: ExternalInterfaceDefaultRoute}
type: ovs_bridge
use_dhcp: false
- addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
mtu: 1350
name: nic3
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
mtu: 1350
name: nic5
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: TenantIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic6
- type: interface
name: nic2
mtu: 1350
primary: true
type: interface
name: br-tenant
type: ovs_bridge
- type: interface
name: nic3
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
- type: interface
name: nic4
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: interface
name: nic5
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
- type: ovs_bridge
name: br-tenant
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: TenantIpSubnet}
members:
- type: interface
name: nic6
mtu: 1350
primary: true
group: os-apply-config
type: OS::Heat::StructuredConfig

28
network-templates/nic-configs/ceph-storage.yaml
View File

@ -83,33 +83,33 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
- type: interface
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
mtu: 1350
name: nic5
type: interface
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: interface
name: nic5
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
group: os-apply-config
type: OS::Heat::StructuredConfig

44
network-templates/nic-configs/compute.yaml
View File

@ -83,44 +83,44 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
- default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
mtu: 1350
- type: interface
name: nic3
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
- type: interface
name: nic4
type: interface
mtu: 1350
use_dhcp: false
- addresses:
- ip_netmask: {get_param: TenantIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic6
primary: true
type: interface
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: ovs_bridge
name: br-tenant
type: ovs_bridge
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: TenantIpSubnet}
members:
- type: interface
name: nic6
mtu: 1350
primary: true
group: os-apply-config
type: OS::Heat::StructuredConfig

82
network-templates/nic-configs/controller.yaml
View File

@ -83,62 +83,62 @@ resources:
config:
os_net_config:
network_config:
- addresses:
- type: interface
name: nic1
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask:
list_join:
- /
- - {get_param: ControlPlaneIp}
- {get_param: ControlPlaneSubnetCidr}
mtu: 1350
name: nic1
routes:
- ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: ExternalIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic2
primary: true
type: interface
- type: ovs_bridge
name: br-ex
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: ExternalIpSubnet}
routes:
- ip_netmask: 0.0.0.0/0
next_hop: {get_param: ExternalInterfaceDefaultRoute}
type: ovs_bridge
use_dhcp: false
- addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
mtu: 1350
name: nic3
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageIpSubnet}
mtu: 1350
name: nic4
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
mtu: 1350
name: nic5
type: interface
use_dhcp: false
- addresses:
- ip_netmask: {get_param: TenantIpSubnet}
dns_servers: {get_param: DnsServers}
members:
- mtu: 1350
name: nic6
- type: interface
name: nic2
mtu: 1350
primary: true
type: interface
name: br-tenant
type: ovs_bridge
- type: interface
name: nic3
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: InternalApiIpSubnet}
- type: interface
name: nic4
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageIpSubnet}
- type: interface
name: nic5
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
- type: ovs_bridge
name: br-tenant
dns_servers: {get_param: DnsServers}
use_dhcp: false
addresses:
- ip_netmask: {get_param: TenantIpSubnet}
members:
- type: interface
name: nic6
mtu: 1350
primary: true
group: os-apply-config
type: OS::Heat::StructuredConfig