summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-30 14:04:31 +0000
committerGerrit Code Review <review@openstack.org>2017-06-30 14:04:31 +0000
commitc22b2804b5998be928fcbfdff81dc27028189978 (patch)
tree1dc096ae5e6143ca3eb283e1f2b8a0c6c86c5caa /environments
parent711bb776198ab076f38eca04b69f08cefd15048b (diff)
parent9eb4311c9d07cb14824d502904cce2dfce23cb88 (diff)
Merge "cisco nexus: keep OVS on the Compute"
Diffstat (limited to 'environments')
-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 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: