From 48f1149459ecb9f3258cd8a93aee869243e0c9ed Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 21 Jul 2015 12:49:46 +0200 Subject: 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 --- puppet/manifests/overcloud_controller.pp | 1 + puppet/manifests/overcloud_controller_pacemaker.pp | 2 ++ 2 files changed, 3 insertions(+) (limited to 'puppet/manifests') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 03f47eca..46f2641b 100644 --- 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 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, -- cgit 1.2.3-korg