opendev/puppet-infracloud
Code Issues Proposed changes

Merge "Parameterize entries for neutron subnet"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 20:58:12 +00:00 committed by Gerrit Code Review
commit c37f4b7d83
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/controller.pp
View File

@ -30,6 +30,13 @@ class infracloud::controller(
$glance_ssl_cert_file_contents = undef,
$nova_ssl_key_file_contents = undef,
$nova_ssl_cert_file_contents = undef,
$neutron_subnet_cidr = '15.184.52.0/22', # TODO: once related changes land, this needs to be mandatory (yolanda)
$neutron_subnet_gateway = '15.184.52.1', # TODO: once related changes land, this needs to be mandatory (yolanda)
$neutron_subnet_allocation_pools = [ # TODO: once related changes land, this needs to be mandatory (yolanda)
'start=15.184.53.2,end=15.184.53.254',
'start=15.184.54.2,end=15.184.54.254',
'start=15.184.55.2,end=15.184.55.254'
],
) {
$keystone_auth_uri = "https://${controller_public_address}:5000"
@ -270,16 +277,12 @@ class infracloud::controller(
}
# Provider subnet with three allication pools representing three "subnets"
neutron_subnet { 'provider-subnet-53-54-55':
cidr => '15.184.52.0/22',
gateway_ip => '15.184.52.1',
neutron_subnet { 'provider-subnet-infracloud':
cidr => $neutron_subnet_cidr,
gateway_ip => $neutron_subnet_gateway,
network_name => 'public',
dns_nameservers => ['8.8.8.8'],
allocation_pools => [
'start=15.184.53.2,end=15.184.53.254',
'start=15.184.54.2,end=15.184.54.254',
'start=15.184.55.2,end=15.184.55.254'
],
dns_nameservers => ['8.8.8.8', ],
allocation_pools => $neutron_subnet_allocation_pools,
}
### Nova ###