summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2015-03-11 18:44:28 +0100
committerDan Prince <dprince@redhat.com>2015-03-11 16:54:55 -0400
commit10c2cfab45018aeb52f4f4b9499f5dc98b075d78 (patch)
tree703dc9e7214ca2a5913373e47861a5ca6caae1fd /puppet/manifests
parent3bb5a23da2dafd658912e2e47e427ca515757400 (diff)
Puppet: Configure neutron_api_class on controller
We're already configuring Neutron in Overcloud, but the controller is still configured to use the default Nova neutron_api_class for default configuration for networking, which means it used Nova Network and not Neutron. This causes some of the Nova API is_neutron checks to behave incorrectly. This patch updates the controller to use nova::network::neutron (like we already do on the overcloud_compute.pp role). As part of the change several of the compute specific hiera settings for the nova::network::neutron class have been moved to common.yaml. Change-Id: Id2d5a5a0aa1ca087de714880ef1ea98484b06849
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 390eddac..81e8799e 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -210,6 +210,7 @@ if hiera('step') >= 2 {
include ::nova::cert
include ::nova::conductor
include ::nova::consoleauth
+ include ::nova::network::neutron
include ::nova::vncproxy
include ::nova::scheduler