diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-16 22:06:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-16 22:06:43 +0000 |
| commit | 05f28100cc7b7c80fecad4a89b8868cb78595e5b (patch) | |
| tree | c49c5e58364daf130a75132c0689ecc1e0da8026 | |
| parent | 9f272bda18824941a1ce9b406e6b9676664a712e (diff) | |
| parent | 7017ba95ee6a3ae30e9c82a3d0aaa0a7030808a7 (diff) | |
Merge "Disable ComputeNeutron* for cisco-nexus-ucsm" into stable/ocata
| -rw-r--r-- | environments/neutron-ml2-cisco-nexus-ucsm.yaml | 2 |
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 ad111757..f5a0a399 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' |