From: Gonéri Le Bouder <goneri@redhat.com>
Date: Wed, 21 Jun 2017 19:00:27 +0000 (-0400)
Subject: cisco nexus: keep OVS on the Compute
X-Git-Tag: opnfv-6.0.0~452^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9eb4311c9d07cb14824d502904cce2dfce23cb88;p=apex-tripleo-heat-templates.git

cisco nexus: keep OVS on the Compute

The Cisco Nexus-UCSM environment relies on OVS for the communication
with compute nodes. This is a partial revert of
I4c98008107568b3b65decd7640e25c7d2b1ea9ff.

Change-Id: I453d4bc83314a76fd779884fb2f8cd1731d2bcaa
Related-Bug: #1687597
---

diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
index f5a0a399..2c87470b 100644
--- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -2,7 +2,6 @@
 # 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: