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.pp | |
| parent | 1e5e9b172c02bbaa49d3176cfecbe40cccad74f2 (diff) | |
| parent | fd922970e86d62d3da7ea5bbde37418fdbcb248e (diff) | |
Merge "OpenContrail heat templates"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 5c36c674..c304e94e 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -304,11 +304,13 @@ if hiera('step') >= 3 { include ::neutron::server include ::neutron::server::notifications - # If the value of core plugin is set to 'nuage', - # include nuage core plugin, and it does not + # If the value of core plugin is set to 'nuage' or 'opencontrail', + # include nuage or opencontrail core plugins, and it does not # need the l3, dhcp and metadata agents if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' { include ::neutron::plugins::nuage + } elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { + include ::neutron::plugins::opencontrail } else { include ::neutron::agents::l3 include ::neutron::agents::dhcp |