openstack/openstack-virtual-baremetal
Code Issues Proposed changes

Add shared network support for quintupleo

Browse Source 
Because of some changes we are wanting to make in
nodepool.openstack.org, we need the ability to control the shared
network setting.

We'll be now using 2 projects to configure tripleo-ci, so baremetal
nodes and zuul workers will not be in the same project any more. This
means we need to share networks between more then 1 project.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-18 12:08:32 -04:00
parent de2a7c917a
commit dfd3a00d0a
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/env.yaml.example
View File

@ -13,7 +13,9 @@ parameters:
baremetal_prefix: baremetal
node_count: 2
public_net: public
public_net_shared: false
provision_net: provision
provision_net_shared: false
# QuintupleO-specific params ignored by virtual-baremetal.yaml
undercloud_name: undercloud
undercloud_image: CentOS-7-x86_64-GenericCloud

12
templates/quintupleo.yaml
View File

@ -59,6 +59,11 @@ parameters:
description: CIDR for provision network subnet
default: 192.0.2.0/24
provision_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
default: false
public_net:
type: string
description: Name of the overcloud external network
@ -69,6 +74,11 @@ parameters:
description: CIDR for external network subnet
default: 10.0.0.0/24
public_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
default: false
bmc_prefix:
type: string
default: bmc
@ -132,6 +142,7 @@ resources:
type: OS::Neutron::Net
properties:
name: {get_param: provision_net}
shared: {get_param: provision_net_shared}
provision_subnet:
type: OS::Neutron::Subnet
@ -146,6 +157,7 @@ resources:
type: OS::Neutron::Net
properties:
name: {get_param: public_net}
shared: {get_param: public_net_shared}
public_subnet:
type: OS::Neutron::Subnet