diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-06 00:49:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-06 00:49:17 +0000 |
| commit | 0e5b8125ded08546876a87cd9e48cdf043bb517b (patch) | |
| tree | 35449bdda5a810ed83777ee315a5dfd2af50ca41 /environments | |
| parent | 230267fe97ead1901dfdf783ab2d86d9357eef6b (diff) | |
| parent | 043adb98051be1b192117e67832d664e10d1d0ca (diff) | |
Merge "Fixes port binding controller for OpenDaylight" into stable/ocata
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opendaylight.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml index e08b2b27..4f0de91c 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -3,6 +3,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::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-odl.yaml 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 |