diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-20 18:35:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-20 18:35:45 +0000 |
| commit | 980668899a8d04267ac9085aa8456bc38a351b7e (patch) | |
| tree | 45066d91e4bbdda0f53e944a878f027c12117048 | |
| parent | 81aa47d3143bf58cffdb0bd9fbacfd0e05e195e4 (diff) | |
| parent | 6b9fe61995d3cece93fa152b2ef9120690b957b2 (diff) | |
Merge "Disables Neutron ML2 config on Compute for OpenDaylight"
| -rw-r--r-- | environments/neutron-opendaylight-l3.yaml | 1 | ||||
| -rw-r--r-- | environments/neutron-opendaylight.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml index 0e8fb9aa..5c47147e 100644 --- a/environments/neutron-opendaylight-l3.yaml +++ b/environments/neutron-opendaylight-l3.yaml @@ -2,6 +2,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml OS::TripleO::Services::NeutronL3Agent: OS::Heat::None diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml index a0fe4514..8110eab3 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -2,6 +2,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml |