summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-30 21:17:41 +0000
committerGerrit Code Review <review@openstack.org>2017-05-30 21:17:41 +0000
commit24225deb74edbc8d55f782ed8e858e04bd739870 (patch)
tree591c1101b3b297d7cef912aaa9afff23c55c22e9
parentdd42fe9555f2fd7dc772fdca8e834b2b6d73f6f7 (diff)
parentdb34e8e61f383e99192a0c23bb4fcf69f304d564 (diff)
Merge "Disable ComputeNeutron* for cisco-nexus-ucsm" into stable/newton
-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 @@
2# a Cisco Neutron plugin. 2# a Cisco Neutron plugin.
3resource_registry: 3resource_registry:
4 OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml 4 OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
5 OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
6 OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
5 7
6parameter_defaults: 8parameter_defaults:
7 NetworkUCSMIp: '127.0.0.1' 9 NetworkUCSMIp: '127.0.0.1'