summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-12 17:41:20 +0000
committerGerrit Code Review <review@openstack.org>2016-07-12 17:41:20 +0000
commit91b00eaf8d520ff36007a8b5a74d3bc79c0b1eed (patch)
tree78b852de5093910a8102f3c0e7ebf99b8da1a1dc
parente9df98a8fb4105c9d039b071e951a3aabd8e9025 (diff)
parentbf76cf6c706682047747956304f1e7643a816212 (diff)
Merge "Composable Midonet compute plugin"
-rw-r--r--environments/neutron-midonet.yaml2
-rw-r--r--puppet/manifests/overcloud_compute.pp23
-rw-r--r--puppet/services/neutron-compute-plugin-midonet.yaml19
3 files changed, 21 insertions, 23 deletions
diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml
index cdf5fb68..c120d0b3 100644
--- a/environments/neutron-midonet.yaml
+++ b/environments/neutron-midonet.yaml
@@ -7,7 +7,7 @@ resource_registry:
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
- OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-midonet.yaml
parameter_defaults:
EnableZookeeperOnController: true
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
diff --git a/puppet/services/neutron-compute-plugin-midonet.yaml b/puppet/services/neutron-compute-plugin-midonet.yaml
new file mode 100644
index 00000000..c3b65c49
--- /dev/null
+++ b/puppet/services/neutron-compute-plugin-midonet.yaml
@@ -0,0 +1,19 @@
+heat_template_version: 2016-04-08
+
+description: >
+ OpenStack Neutron Compute Midonet plugin
+
+parameters:
+ EndpointMap:
+ default: {}
+ description: Mapping of service endpoint -> protocol. Typically set
+ via parameter_defaults in the resource registry.
+ type: json
+
+outputs:
+ role_data:
+ description: Role data for the Neutron Compute Plumgrid plugin
+ value:
+ config_settings:
+ step_config: |
+ include ::tripleo::profile::base::neutron::agents::midonet