openstack
/
tripleo-ci
Code Issues Proposed changes

Re-generate nic-configs 

The template generator tool has been improved to output more readable
templates.  This just re-generates the tripleo-ci templates to take
advantage of that.

Change-Id: Id4230b88e9ed8bcd865f989c0f5c88930eb94dce
This commit is contained in:
Ben Nemec 2017-01-11 11:07:07 -06:00
parent bc40284a4a
commit 2b470d2ad7
8 changed files with 604 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test-environments/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
test-environments/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
test-environments/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

22
test-environments/network-templates/README Normal file
View File

@ -0,0 +1,22 @@
Generated Network Isolation Templates
-------------------------------------
These templates were generated by the UI tool at
https://github.com/cybertron/tripleo-scripts#net-iso-genpy
ui-settings.pickle is specific to the tool. TripleO will not use it when
doing deployments with these templates, but it is needed to be able to
load the templates into the UI again. Note that the UI only reads this file,
so any changes made by hand to the templates will not be reflected in the UI.
The network-isolation.yaml file needs to reference the port files shipped with
tripleo-heat-templates, so by default the tool generates the paths assuming
network-isolation.yaml will be copied into the environments/ directory of
tripleo-heat-templates.
If these templates are at ~/generated-templates and a local copy of
tripleo-heat-templates (it is not recommended to make changes to the packaged
tripleo-heat-templates tree) is at ~/tht, then an example deployment would
look like this:
cp ~/generated-templates/network-isolation.yaml ~/tht/environments/generated-network-isolation.yaml
openstack overcloud deploy --templates ~/tht -e ~/tht/environments/generated-network-isolation.yaml -e ~/generated-templates/network-environment.yaml

28
test-environments/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
test-environments/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
test-environments/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

850
test-environments/network-templates/ui-settings.pickle
View File

File diff suppressed because it is too large Load Diff