Use 'public' instead of 'nova' as default floating pool name

The dafault in nova.conf for default_floating_pool is set to nova
which is confusing given to make Tempest tests to pass one has to
create a public network with such a name.

Change-Id: I148222a9f276309ede062ee5292993898ff899d6

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 673c777..bb49bb9 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -18,6 +18,8 @@ nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fs
 nova::config::nova_config:
   cinder/catalog_info:
     value: 'volumev2:cinderv2:internalURL'
+  DEFAULT/default_floating_pool:
+    value: 'public'
 
 ceilometer::agent::auth::auth_tenant_name: 'service'
 

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 3cc6497..7ee4708 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -73,6 +73,10 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::api::osapi_v3: true
 
+nova::config::nova_config:
+  DEFAULT/default_floating_pool:
+    value: 'public'
+
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
 

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 03f47ec..46f2641 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -247,6 +247,7 @@ if hiera('step') >= 3 {
   class { '::nova' :
     memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'),
   }
+  include ::nova::config
   include ::nova::api
   include ::nova::cert
   include ::nova::conductor

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 8f6d4c6..5bd16e4 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -567,6 +567,8 @@ if hiera('step') >= 3 {
     memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'),
   }
 
+  include ::nova::config
+
   class { '::nova::api' :
     sync_db => $sync_db,
     manage_service => false,