opendev/system-config
Code Issues Proposed changes

Merge "Send the network parameters to infracloud controller"

Browse Source
This commit is contained in:
Jenkins 2016-02-26 05:22:54 +00:00 committed by Gerrit Code Review
commit 041f77a3ef
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -1187,6 +1187,13 @@ node 'controller00.hpuswest.ic.openstack.org' {
controller_public_address => $::fqdn, controller_public_address => $::fqdn,
openstackci_password => hiera('openstackci_infracloud_password'), openstackci_password => hiera('openstackci_infracloud_password'),
openstackjenkins_password => hiera('openstackjenkins_infracloud_password'), openstackjenkins_password => hiera('openstackjenkins_infracloud_password'),
neutron_subnet_cidr => '15.184.52.0/22',
neutron_subnet_gateway => '15.184.52.1',
neutron_subnet_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'
]
} }
} }

6
modules/openstack_project/manifests/infracloud/controller.pp
View File

@ -20,6 +20,9 @@ class openstack_project::infracloud::controller (
$openstackci_email = 'infra-root@openstack.org', $openstackci_email = 'infra-root@openstack.org',
$openstackjenkins_password, $openstackjenkins_password,
$openstackjenkins_email = 'infra-root@openstack.org', $openstackjenkins_email = 'infra-root@openstack.org',
$neutron_subnet_cidr,
$neutron_subnet_gateway,
$neutron_subnet_allocation_pools,
) { ) {
class { '::infracloud::controller': class { '::infracloud::controller':
keystone_rabbit_password => $keystone_rabbit_password, keystone_rabbit_password => $keystone_rabbit_password,
@ -39,6 +42,9 @@ class openstack_project::infracloud::controller (
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
br_name => $br_name, br_name => $br_name,
controller_public_address => $controller_public_address, controller_public_address => $controller_public_address,
neutron_subnet_cidr => $neutron_subnet_cidr,
neutron_subnet_gateway => $neutron_subnet_gateway,
neutron_subnet_allocation_pools => $neutron_subnet_allocation_pools,
} }
keystone_domain { 'infra': keystone_domain { 'infra':