diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-10 12:03:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-10 12:03:11 +0000 |
| commit | d0840a512d830e30730abfaf3b3f734e61fcebd4 (patch) | |
| tree | d938359f39beb37c432dcd3847bf3453f679381d /environments/neutron-opendaylight-dpdk.yaml | |
| parent | 690b938c58af1446bd27c34b17fa45e865241e99 (diff) | |
| parent | c95a8a5d1006571f1b6a1e43ac2400fa81237216 (diff) | |
Merge "Env files for ODL deployments" into stable/pike
Diffstat (limited to 'environments/neutron-opendaylight-dpdk.yaml')
| -rw-r--r-- | environments/neutron-opendaylight-dpdk.yaml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/environments/neutron-opendaylight-dpdk.yaml b/environments/neutron-opendaylight-dpdk.yaml index 0d598980..749b2150 100644 --- a/environments/neutron-opendaylight-dpdk.yaml +++ b/environments/neutron-opendaylight-dpdk.yaml @@ -1,17 +1,7 @@ # A Heat environment that can be used to deploy OpenDaylight with L3 DVR and DPDK -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 +# This file is to be used with neutron-opendaylight.yaml parameter_defaults: - NeutronEnableForceMetadata: true - NeutronPluginExtensions: 'port_security' - NeutronMechanismDrivers: 'opendaylight_v2' - NeutronServicePlugins: 'odl-router_v2,trunk' NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter" OpenDaylightSNATMechanism: 'controller' |