diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-02-29 15:31:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-02-29 15:31:51 +0000 |
commit | 6677663e1141c1baabb0769191a7f951abe0c66d (patch) | |
tree | 3f51ee76c267a45e80da32328c8e70c3a92ba959 /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | 1e5e9b172c02bbaa49d3176cfecbe40cccad74f2 (diff) | |
parent | fd922970e86d62d3da7ea5bbde37418fdbcb248e (diff) |
Merge "OpenContrail heat templates"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 20ff49cd..c6c69b78 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -678,6 +678,9 @@ if hiera('step') >= 3 { if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' { include ::neutron::plugins::nuage } + 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('tripleo::loadbalancer::public_virtual_ip'), |