summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-16 13:39:58 +0000
committerGerrit Code Review <review@openstack.org>2015-07-16 13:39:58 +0000
commitb9a1f31df3d4a33b1d317ad0f970b88adff17f5a (patch)
tree5137cc1680871c4f4a41f7eed2eac466c02aecca
parent1ce0f9db531a40e0c3915906a24c002d8ed3eae6 (diff)
parent0d52f379852492e690712d4f0efdf404c7fd9b71 (diff)
Merge "Provide manage_service to neutron::agents::ml2::ovs"
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 83d0d158..e739ca03 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -625,7 +625,7 @@ if hiera('step') >= 3 {
tenant_network_types => [hiera('neutron_tenant_network_type')],
}
class { 'neutron::agents::ml2::ovs':
- # manage_service => false # not implemented
+ manage_service => false,
enabled => false,
bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
tunnel_types => split(hiera('neutron_tunnel_types'), ','),