From 656bc517e97792d6ef9ff0db4a224067a1101cb1 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Date: Wed, 24 Feb 2016 23:52:38 +0100 Subject: [PATCH] Send the network parameters to infracloud controller Also send the default values for west, to be sure that settings are properly applied. Change-Id: Ie332bf2b9970be02311bf76888c28d25249abf61 --- manifests/site.pp | 7 +++++++ .../openstack_project/manifests/infracloud/controller.pp | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 8e72e81609..eba74d4213 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 1f1ce9b60d..f5a858c05e 100644 --- a/modules/openstack_project/manifests/infracloud/controller.pp +++ b/modules/openstack_project/manifests/infracloud/controller.pp @@ -21,6 +21,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, @@ -41,6 +44,9 @@ class openstack_project::infracloud::controller ( br_name => $br_name, controller_management_address => $controller_management_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':