diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-05 15:24:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-05 15:24:46 +0000 |
commit | 698e65274ed8e9bb31f0d101bade1bd5ee14e0b6 (patch) | |
tree | e93cb400c25aaaa60e5b1d34ab8a06127449de49 /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | d625668939eb4a45440659e808a7b72fc21334fe (diff) | |
parent | c26b53ca42c2cde70db091b40c04e775acb40e29 (diff) |
Merge "Fix list of type_drivers for ML2 plugin"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index ac05c367..695724b8 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -509,7 +509,6 @@ if hiera('step') >= 3 { class { 'neutron::plugins::ml2': flat_networks => split(hiera('neutron_flat_networks'), ','), tenant_network_types => [hiera('neutron_tenant_network_type')], - type_drivers => [hiera('neutron_tenant_network_type')], } class { 'neutron::agents::ml2::ovs': # manage_service => false # not implemented |