openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable ComputeNeutron* for cisco-nexus-ucsm" into stable/newton

This commit is contained in:
Jenkins 2017-05-30 21:17:41 +00:00 committed by Gerrit Code Review
parent dd42fe9555 db34e8e61f
commit 24225deb74
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/neutron-ml2-cisco-nexus-ucsm.yaml
View File

@ -2,6 +2,8 @@
# a Cisco Neutron plugin.
resource_registry:
OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NetworkUCSMIp: '127.0.0.1'