aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-23 03:58:25 +0000
committerGerrit Code Review <review@openstack.org>2016-06-23 03:58:25 +0000
commit23ec8e1509717bb230f77096d3892812f3e67c14 (patch)
tree047c18b0da5cfbdd743989741d8d4df022794173 /puppet/manifests/overcloud_controller_pacemaker.pp
parentf32de519adb072ee5ca38b01044f983ac4437444 (diff)
parent37bb689a0fe37e9365373dbd47291a4323d36bd7 (diff)
Merge "Composable opencontrail plugin"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 0bee6b0..9bb40fc 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -392,9 +392,6 @@ MYSQL_HOST=localhost\n",
}
- if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
- include ::neutron::plugins::opencontrail
- }
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
class {'::neutron::plugins::midonet':
midonet_api_ip => hiera('public_virtual_ip'),