diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-15 14:51:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-15 14:51:41 +0000 |
| commit | 7c7fe7bc8ba13379554dafec3936281d8401f29b (patch) | |
| tree | b32c2eddac163e38daa21863fb2de2adf3882321 /environments | |
| parent | e8dc8c6faeabfbe0fc82dd554c9f184e6a087ae4 (diff) | |
| parent | 95fbda4d0254edb12bfec1ccd41d3b5f6204fe8f (diff) | |
Merge "Disable ComputeNeutron* for cisco-nexus-ucsm"
Diffstat (limited to 'environments')
| -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' |