diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 17:43:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 17:43:29 +0000 |
| commit | 50eaf849f89030068293bcd500d487b8b26ad30a (patch) | |
| tree | 957859c05dc8421b60107ab78852616efc7ad6aa /puppet/manifests | |
| parent | de7d6fd004d364ffbae4741b93dde8e942181b4d (diff) | |
| parent | b510cabb86d9e887e1f849fe56b98624d578f55b (diff) | |
Merge "Composable OpenContrail compute plugin"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 5d315a72..1a86b38a 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -33,16 +33,6 @@ if hiera('step') >= 4 { 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; } - if 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'], - #} - } - include ::ceilometer include ::ceilometer::config include ::ceilometer::agent::compute |