aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonéri Le Bouder <goneri@redhat.com>2017-06-21 15:00:27 -0400
committerGonéri Le Bouder <goneri@redhat.com>2017-07-05 15:52:16 -0400
commitec87f2b3562d20735085edd17a600335540b96c8 (patch)
treedc46643084d984954dcc7a7e2165396f104fac5e
parentf762bbc3610cad472b9e10cac3609818384ed520 (diff)
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 (cherry picked from commit 9eb4311c9d07cb14824d502904cce2dfce23cb88)
-rw-r--r--environments/neutron-ml2-cisco-nexus-ucsm.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
index f5a0a39..2c87470 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: