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_controller.pp | |
parent | d3cb9359416098309f728845297f263e30aa6e7b (diff) | |
parent | a2cb9e478d9a4cfaf064a2956bffe6d414bd47c0 (diff) |
Merge "Wire Neutron ML2 plugin and OVS agent settings as arrays"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 683c1213..7d3012e5 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -252,16 +252,10 @@ if hiera('step') >= 3 { require => Package['neutron'], } - class { '::neutron::plugins::ml2': - flat_networks => split(hiera('neutron_flat_networks'), ','), - tenant_network_types => [hiera('neutron_tenant_network_type')], - mechanism_drivers => [hiera('neutron_mechanism_drivers')], - } - class { '::neutron::agents::ml2::ovs': - bridge_mappings => split(hiera('neutron_bridge_mappings'), ','), - tunnel_types => split(hiera('neutron_tunnel_types'), ','), - } - if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { + include ::neutron::plugins::ml2 + include ::neutron::agents::ml2::ovs + + if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { include ::neutron::plugins::ml2::cisco::nexus1000v class { '::neutron::agents::n1kv_vem': @@ -276,10 +270,10 @@ if hiera('step') >= 3 { } } - if 'cisco_ucsm' in hiera('neutron_mechanism_drivers') { + if 'cisco_ucsm' in hiera('neutron::plugins::ml2::mechanism_drivers') { include ::neutron::plugins::ml2::cisco::ucsm } - if 'cisco_nexus' in hiera('neutron_mechanism_drivers') { + if 'cisco_nexus' in hiera('neutron::plugins::ml2::mechanism_drivers') { include ::neutron::plugins::ml2::cisco::nexus include ::neutron::plugins::ml2::cisco::type_nexus_vxlan } @@ -467,7 +461,7 @@ if hiera('step') >= 3 { include ::heat::engine # Horizon - if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { + if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { $_profile_support = 'cisco' } else { $_profile_support = 'None' |