summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-07-21 12:49:46 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-07-23 12:36:02 +0200
commit48f1149459ecb9f3258cd8a93aee869243e0c9ed (patch)
tree889cd24d9e2f41e94b50a03e3ecfc91a60325d5b /puppet/hieradata
parent9b5e99a56a8c2d7cbfc7e1c1e8b86dd894c55efa (diff)
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
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/compute.yaml2
-rw-r--r--puppet/hieradata/controller.yaml4
2 files changed, 6 insertions, 0 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 673c7773..bb49bb90 100644
--- 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 3cc64971..7ee4708d 100644
--- 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