diff options
author | Dan Prince <dprince@redhat.com> | 2016-07-06 14:23:54 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-07-12 09:48:31 -0400 |
commit | b510cabb86d9e887e1f849fe56b98624d578f55b (patch) | |
tree | ee1c90967eb3657a7e35eec82fb8bec18c8a9ce5 /puppet/manifests | |
parent | 613e009d9f52e5a95a95e7e7ed2491ccc06e89d6 (diff) |
Composable OpenContrail compute plugin
Adds a new neutron compute plugin used to help configure opencontrail
for use on compute nodes.
Change-Id: I67a649445d5f1cb21ab9483bae7f5f4c2c657142
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 |