diff --git a/manifests/site.pp b/manifests/site.pp index 0acc22d8a4..08052eb2f9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1187,6 +1187,13 @@ node 'controller00.hpuswest.ic.openstack.org' { controller_public_address => $::fqdn, openstackci_password => hiera('openstackci_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' + ] } } diff --git a/modules/openstack_project/manifests/infracloud/controller.pp b/modules/openstack_project/manifests/infracloud/controller.pp index eb718d8df4..ed7552b964 100644 --- a/modules/openstack_project/manifests/infracloud/controller.pp +++ b/modules/openstack_project/manifests/infracloud/controller.pp @@ -20,6 +20,9 @@ class openstack_project::infracloud::controller ( $openstackci_email = 'infra-root@openstack.org', $openstackjenkins_password, $openstackjenkins_email = 'infra-root@openstack.org', + $neutron_subnet_cidr, + $neutron_subnet_gateway, + $neutron_subnet_allocation_pools, ) { class { '::infracloud::controller': keystone_rabbit_password => $keystone_rabbit_password, @@ -39,6 +42,9 @@ class openstack_project::infracloud::controller ( ssl_cert_file_contents => $ssl_cert_file_contents, br_name => $br_name, 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':