From: Steven Hardy <shardy@redhat.com>
Date: Wed, 3 May 2017 08:44:21 +0000 (+0100)
Subject: Disable ComputeNeutron* for cisco-nexus-ucsm
X-Git-Tag: opnfv-6.0.0~669^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=95fbda4d0254edb12bfec1ccd41d3b5f6204fe8f;p=apex-tripleo-heat-templates.git

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
---

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'