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-sriov.yaml | |
parent | 690b938c58af1446bd27c34b17fa45e865241e99 (diff) | |
parent | c95a8a5d1006571f1b6a1e43ac2400fa81237216 (diff) |
Merge "Env files for ODL deployments" into stable/pike
Diffstat (limited to 'environments/neutron-opendaylight-sriov.yaml')
-rw-r--r-- | environments/neutron-opendaylight-sriov.yaml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/environments/neutron-opendaylight-sriov.yaml b/environments/neutron-opendaylight-sriov.yaml index 3a212ed3..52924070 100644 --- a/environments/neutron-opendaylight-sriov.yaml +++ b/environments/neutron-opendaylight-sriov.yaml @@ -1,19 +1,10 @@ # A Heat environment that can be used to deploy OpenDaylight with SRIOV resource_registry: - OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-plugin-ml2.yaml - 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::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None parameter_defaults: - NeutronEnableForceMetadata: true - NeutronPluginExtensions: 'port_security' NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2'] - NeutronServicePlugins: 'odl-router_v2,trunk' # Add PciPassthroughFilter to the scheduler default filters #NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter'] |