aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-24 06:38:52 +0000
committerGerrit Code Review <review@openstack.org>2015-07-24 06:38:52 +0000
commite39fccd99e5e6c8e5f80b05d53e0933893155f65 (patch)
tree6cdb943d0c5425fbb1e61e3293c08ee603e60e72 /puppet/hieradata/controller.yaml
parentf00e08cbfd21a39f011a291473eaf13110847725 (diff)
parent48f1149459ecb9f3258cd8a93aee869243e0c9ed (diff)
Merge "Use 'public' instead of 'nova' as default floating pool name"
Diffstat (limited to 'puppet/hieradata/controller.yaml')
-rw-r--r--puppet/hieradata/controller.yaml4
1 files changed, 4 insertions, 0 deletions
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