diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-16 11:12:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-16 11:12:59 +0000 |
| commit | bce5f65f2e036f6ef5232fdfc8025d7f864faa56 (patch) | |
| tree | f1b889e3aea47f3485bc48e6d8ffb0a0db48f3be /puppet/manifests/overcloud_compute.pp | |
| parent | d3cb9359416098309f728845297f263e30aa6e7b (diff) | |
| parent | a2cb9e478d9a4cfaf064a2956bffe6d414bd47c0 (diff) | |
Merge "Wire Neutron ML2 plugin and OVS agent settings as arrays"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index f3a02eba..e0566ac1 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -85,17 +85,10 @@ if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' { nova_auth_ip => hiera('keystone_public_api_virtual_ip'), } } else { - class { '::neutron::plugins::ml2': - flat_networks => split(hiera('neutron_flat_networks'), ','), - tenant_network_types => [hiera('neutron_tenant_network_type')], - } - - class { '::neutron::agents::ml2::ovs': - bridge_mappings => split(hiera('neutron_bridge_mappings'), ','), - tunnel_types => split(hiera('neutron_tunnel_types'), ','), - } + include ::neutron::plugins::ml2 + include ::neutron::agents::ml2::ovs - if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { + if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { class { '::neutron::agents::n1kv_vem': n1kv_source => hiera('n1kv_vem_source', undef), n1kv_version => hiera('n1kv_vem_version', undef), |