openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

Neutron ML2 plugin has been containerized, we need to switch
ComputeNeutronCorePlugin to use the containerized service in THT for the
Neutron ML2 plugin, otherwise Neutron will be configured on the host and
not in the container.

Change-Id: I744cde656cc827762b13995d05f8881d4da2b5b8
Closes-Bug: #1762504
(cherry picked from commit f35c417804)
This commit is contained in:
Emilien Macchi 2018-04-09 11:39:27 -07:00
parent 29bf121e05
commit 367605ce3e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -158,7 +158,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePlugin: docker/services/neutron-plugin-ml2.yaml
# can be the same as NeutronCorePlugin but some vendors install different
# 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
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginML2OVN: puppet/services/neutron-plugin-ml2-ovn.yaml