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_compute.pp | |
| parent | 1e5e9b172c02bbaa49d3176cfecbe40cccad74f2 (diff) | |
| parent | fd922970e86d62d3da7ea5bbde37418fdbcb248e (diff) | |
Merge "OpenContrail heat templates"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 0f1318c3..7925f50a 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -120,6 +120,15 @@ elsif hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV cassandra_seeds => $cassandra_node_ips } } +elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { + + include ::contrail::vrouter + # NOTE: it's not possible to use this class without a functional + # contrail controller up and running + #class {'::contrail::vrouter::provision_vrouter': + # require => Class['contrail::vrouter'], + #} +} else { include ::neutron::plugins::ml2 |