summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
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/manifests/overcloud_controller_pacemaker.pp
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/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 8f6d4c60..5bd16e4c 100644
--- 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,