openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Sync neutron-ml2-ansible.yaml files 

The two files have different contents. Using the one in the services sub
as the source of truth and making them the same.

Change-Id: Idbdd03710c3c7f14d00242cc7327ce06f3442a4b
Closes-Bug: #1864721
This commit is contained in:
Brent Eagles 2020-02-26 16:38:51 -03:30
parent 6ba727a493
commit 2468c23c98
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/neutron-ml2-ansible.yaml
View File

@ -1,8 +1,9 @@
# A Heat environment file which can be used to enable network-ansible ML2 mechanism driver
resource_registry:
OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
parameter_defaults:
IronicApiMaxRetries: 180
IronicDefaultNetworkInterface: neutron
NeutronMechanismDrivers: ovn,ansible
NeutronTypeDrivers: local,geneve,vlan,flat