From 8e7a13ebe898a9f6a94bf77d095a681ec744e719 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Tue, 22 Sep 2015 00:06:34 +0100 Subject: Pass default_floating_pool into nova::api class We were calling nova_config resource to define it but as of Ic060fc18c8f5d7dc8fcf1d7bd921623dc505a515 its now included as part of the nova::api class. Closes-bug: #1498237 Change-Id: I948f26304536e2d692acf38d994d29167672168b Depends-On: I2789e782a4fd673e09c6334b6d56819c68414c80 --- puppet/hieradata/controller.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'puppet/hieradata/controller.yaml') diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 9929cfa6..4b8711d8 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -74,13 +74,10 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf # nova nova::notify_on_state_change: 'vm_and_task_state' +nova::api::default_floating_pool: 'public' nova::api::osapi_v3: true nova::scheduler::filter::ram_allocation_ratio: '1.0' -nova::config::nova_config: - DEFAULT/default_floating_pool: - value: 'public' - # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler -- cgit 1.2.3-korg