aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-15 05:20:12 +0000
committerGerrit Code Review <review@openstack.org>2016-06-15 05:20:12 +0000
commit07586ca090cf2e8257aec654709e76b3177e8572 (patch)
tree5873eae25be91e7425a4068c905fe1b7cee19799 /puppet/manifests/overcloud_controller_pacemaker.pp
parent708bf15975d8bfb4b7bc9426a86369d82c0d4dd9 (diff)
parentcf04308ee598b2a6d791c9b4834a746b8b373713 (diff)
Merge "Composable Neutron Plumgrid plugin"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 1dc121a..7710217 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -413,14 +413,6 @@ MYSQL_HOST=localhost\n",
keystone_password => hiera('neutron::server::password')
}
}
- if hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' {
- class { '::neutron::plugins::plumgrid' :
- connection => hiera('neutron::server::database_connection'),
- controller_priv_host => hiera('keystone_admin_api_vip'),
- admin_password => hiera('admin_password'),
- metadata_proxy_shared_secret => hiera('nova::api::neutron_metadata_proxy_shared_secret'),
- }
- }
if $enable_ceph {
$ceph_pools = hiera('ceph_pools')