Merge "Update OS::TripleO::Services::ComputeNeutronCorePlugin for containers"

This commit is contained in:
Zuul 2018-04-12 18:11:44 +00:00 committed by Gerrit Code Review
commit 0b45e404cb

View File

@ -148,7 +148,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePlugin: docker/services/neutron-plugin-ml2.yaml OS::TripleO::Services::NeutronCorePlugin: docker/services/neutron-plugin-ml2.yaml
# can be the same as NeutronCorePlugin but some vendors install different # can be the same as NeutronCorePlugin but some vendors install different
# things where VMs run # things where VMs run
OS::TripleO::Services::ComputeNeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml OS::TripleO::Services::ComputeNeutronCorePlugin: docker/services/neutron-plugin-ml2.yaml
OS::TripleO::Services::ComputeNeutronCorePluginNuage: puppet/services/neutron-compute-plugin-nuage.yaml OS::TripleO::Services::ComputeNeutronCorePluginNuage: puppet/services/neutron-compute-plugin-nuage.yaml
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin) # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginML2OVN: puppet/services/neutron-plugin-ml2-ovn.yaml OS::TripleO::Services::NeutronCorePluginML2OVN: puppet/services/neutron-plugin-ml2-ovn.yaml