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

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index bb49bb9..7d94e16 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -15,12 +15,11 @@ nova::compute::rbd::rbd_keyring: 'client.openstack'
 nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
 nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
 
+nova::api::default_floating_pool: 'public'
 nova::config::nova_config:
   cinder/catalog_info:
     value: 'volumev2:cinderv2:internalURL'
-  DEFAULT/default_floating_pool:
-    value: 'public'
 
 ceilometer::agent::auth::auth_tenant_name: 'service'
 
-compute_classes: []
\ No newline at end of file
+compute_classes: []

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 9929cfa..4b8711d 100644 (file)
--- 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