openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Consume the NeutronMechanismDrivers from the hiera data"

Browse Source
This commit is contained in:
Jenkins authored and Gerrit Code Review committed 2015-09-15 14:15:11 +00:00
2 parents c6a1289e43 55d7c4ff33
commit c26dc7ea86
2 files changed
+2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

puppet/manifests/overcloud_controller.pp
+1
View File
@@ -239,6 +239,7 @@ if hiera('step') >= 3 {
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'), ','),
puppet/manifests/overcloud_controller_pacemaker.pp
+1
View File
@@ -599,6 +599,7 @@ if hiera('step') >= 3 {
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':
manage_service => false,