From c95a8a5d1006571f1b6a1e43ac2400fa81237216 Mon Sep 17 00:00:00 2001 From: Janki Chhatbar Date: Mon, 23 Oct 2017 10:58:03 +0530 Subject: Env files for ODL deployments This patch adds env files for SRIOV, OVS-DPDK, L2GW, BGPVPN and SFC deployments with ODL. These files contain configs not present in basic ODL deployment env file. While deploying, these need to be used along the basic deployment env file like openstack overcloud deploy \ -e environments/services-docker/neutron-opendaylight.yaml \ -e environments/services-docker/neutron-opendaylight-dpdk.yaml and openstack overcloud deploy \ -e environments/services-docker/neutron-opendaylight.yaml \ -e environments/services-docker/neutron-opendaylight-sriov.yaml and so forth for all other deployments. Closes-Bug: 1722881 Change-Id: I2b70d3f4518e0c014cf37f7fecd92f69989f0860 (cherry picked from commit e0c89d6593dadd9bf6ba9fa6f618e7c44ec7aa2e) --- environments/neutron-opendaylight-dpdk.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'environments/neutron-opendaylight-dpdk.yaml') 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' -- cgit 1.2.3-korg