diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-05-03 09:44:21 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2017-05-15 17:00:37 +0000 |
| commit | 7017ba95ee6a3ae30e9c82a3d0aaa0a7030808a7 (patch) | |
| tree | 790c30a149af95200981ec2a62e9701713a63daf | |
| parent | 7cd92c1b53700fb897e67c9a88214ab52f083c82 (diff) | |
Disable ComputeNeutron* for cisco-nexus-ucsm
It seems this wasn't adjusted when https://review.openstack.org/#/c/338315/
landed, which added interfaces for compute specific neutron configuration,
which is disabled for most vendor backends.
Change-Id: I4c98008107568b3b65decd7640e25c7d2b1ea9ff
Related-Bug: #1687597
(cherry picked from commit 95fbda4d0254edb12bfec1ccd41d3b5f6204fe8f)
| -rw-r--r-- | environments/neutron-ml2-cisco-nexus-ucsm.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml index ad111757..f5a0a399 100644 --- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml +++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml @@ -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' |