Env files for ODL deployments

[apex-tripleo-heat-templates.git] / environments / neutron-opendaylight-sriov.yaml

diff --git a/environments/neutron-opendaylight-sriov.yaml b/environments/neutron-opendaylight-sriov.yaml
index 3a212ed..5292407 100644 (file)
--- 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']