aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-16 22:06:43 +0000
committerGerrit Code Review <review@openstack.org>2017-05-16 22:06:43 +0000
commit05f28100cc7b7c80fecad4a89b8868cb78595e5b (patch)
treec49c5e58364daf130a75132c0689ecc1e0da8026
parent9f272bda18824941a1ce9b406e6b9676664a712e (diff)
parent7017ba95ee6a3ae30e9c82a3d0aaa0a7030808a7 (diff)
Merge "Disable ComputeNeutron* for cisco-nexus-ucsm" into stable/ocata
-rw-r--r--environments/neutron-ml2-cisco-nexus-ucsm.yaml2
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 ad11175..f5a0a39 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'