From 55d7c4ff33956b2493452f81f8f2cbcf8bcf6529 Mon Sep 17 00:00:00 2001 From: marios Date: Wed, 19 Aug 2015 17:41:38 +0300 Subject: [PATCH] Consume the NeutronMechanismDrivers from the hiera data This is passed from the heat templates as hiera data (defaulting to 'openvswitch') but never effected, meaning we get the puppet module default. Change-Id: I3f14cdce9b9bf278aa9b107b2d313e1e82a20709 Closes-Bug: 1488176 --- puppet/manifests/overcloud_controller.pp | 1 + puppet/manifests/overcloud_controller_pacemaker.pp | 1 + 2 files changed, 2 insertions(+) diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index b001d667..8acde9ec 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -236,6 +236,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'), ','), diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index cfd30f13..3795cbaf 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -596,6 +596,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, -- 2.16.6