diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-06-10 15:42:22 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-06-16 15:04:25 -0400 |
| commit | 37bb689a0fe37e9365373dbd47291a4323d36bd7 (patch) | |
| tree | 0480cda17386bda863460022a11b6221bdb2a736 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | 29e04f6dde2ba04edb1861262694fe60fc794362 (diff) | |
Composable opencontrail plugin
Partially-implements: blueprint composable-services-within-roles
Change-Id: I17ac5dc2a6fb82a82d1db039e61fc8e87ba88333
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 27834cf8..13331c9e 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -400,9 +400,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'), |