diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-06-02 09:33:11 -0400 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-12-15 13:38:13 +0100 |
| commit | a2cb9e478d9a4cfaf064a2956bffe6d414bd47c0 (patch) | |
| tree | 83e834add5d80c8484c2acbc11ef928684aea4a2 /puppet/manifests/overcloud_compute.pp | |
| parent | 3e8010dc8506755f193d6e0f84006452b4eaeee5 (diff) | |
Wire Neutron ML2 plugin and OVS agent settings as arrays
Wires the following as arrays to the neutron module:
- mechanism_drivers
- flat_networks
- tenant_network_types
- tunnel_types
- bridge_mappings
Also updates the template version to use a Liberty feature which
allows serialization of comma_delimited_list into JSON.
Tidies up the manifests by removing the class declarations since
config is passed by the puppet/controller+compute hiera mapped_data.
Change-Id: Ie9f85fb827099f897ef750e267bc3ed3a864fe59
Co-Authored-By: Steven Hardy <shardy@redhat.com>
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), |