diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-07-06 14:17:39 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-07-12 09:48:31 -0400 |
| commit | bf76cf6c706682047747956304f1e7643a816212 (patch) | |
| tree | 45aa04cbadec18decaf2f021774b580bc3284114 /puppet/manifests | |
| parent | e8e7c42c0198f9796d3e88cd4ab518fdd61b2e1a (diff) | |
Composable Midonet compute plugin
Adds a new neutron compute plugin used to help configure midonet
for use on compute nodes.
Change-Id: I3a6996d3d9557ecad5ccd26a3901caccbf111468
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index ddb1c358..6c74ee85 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -33,28 +33,7 @@ if hiera('step') >= 4 { 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; } - if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { - file { '/etc/libvirt/qemu.conf': - ensure => present, - content => hiera('midonet_libvirt_qemu_data') - } - } - - # If the value of core plugin is set to 'midonet', - # include midonet agent, - # else use the default value of 'ml2' - if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { - - # TODO(devvesa) provide non-controller ips for these services - $zookeeper_node_ips = hiera('neutron_api_node_ips') - $cassandra_node_ips = hiera('neutron_api_node_ips') - - class { '::tripleo::network::midonet::agent': - zookeeper_servers => $zookeeper_node_ips, - cassandra_seeds => $cassandra_node_ips - } - } - elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { + 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 |