diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opendaylight-fdio-dvr.yaml | 5 | ||||
| -rw-r--r-- | environments/neutron-opendaylight-honeycomb.yaml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/environments/neutron-opendaylight-fdio-dvr.yaml b/environments/neutron-opendaylight-fdio-dvr.yaml index 36882b73..68b2ba56 100644 --- a/environments/neutron-opendaylight-fdio-dvr.yaml +++ b/environments/neutron-opendaylight-fdio-dvr.yaml @@ -1,12 +1,13 @@ # A Heat environment that can be used to deploy OpenDaylight with Honeycomb Agent resource_registry: + OS::TripleO::NodeExtraConfig: ../puppet/extraconfig/all_nodes/vpp-admin-ip.yaml 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::NeutronHoneycombAgent: ../puppet/services/neutron-odl-honeycomb-agent.yaml - OS::TripleO::Services::Vpp: ../puppet/services/vpp-ctlplane-ip.yaml + OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml OS::TripleO::Services::NeutronL3Agent: OS::Heat::None OS::TripleO::Services::ComputeNeutronMetadataAgent: ../puppet/services/neutron-metadata.yaml @@ -15,7 +16,7 @@ parameter_defaults: NeutronL3HA: false #NUMATopologyFilter is required for vhostuser interfaces #NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter" - OpenDaylightFeatures: "odl-restconf,odl-netconf-all,odl-groupbasedpolicy-neutron-vpp-mapper,odl-lispflowmapping-msmr" + OpenDaylightFeatures: "odl-restconf,odl-netconf,odl-vbd,odl-groupbasedpolicy-neutron-vpp-mapper,odl-groupbasedpolicy-vpp,odl-lispflowmapping-msmr,odl-lispflowmapping-mappingservice-shell" NeutronEnableForceMetadata: true NeutronMechanismDrivers: 'opendaylight_v2' NeutronServicePlugins: 'odl-router_v2' diff --git a/environments/neutron-opendaylight-honeycomb.yaml b/environments/neutron-opendaylight-honeycomb.yaml index 6837fbe1..c36e2b33 100644 --- a/environments/neutron-opendaylight-honeycomb.yaml +++ b/environments/neutron-opendaylight-honeycomb.yaml @@ -14,7 +14,7 @@ parameter_defaults: NeutronL3HA: false #NUMATopologyFilter is required for vhostuser interfaces #NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter" - OpenDaylightFeatures: "odl-netconf-all,odl-vbd,odl-groupbasedpolicy-neutron-vpp-mapper,odl-restconf" + OpenDaylightFeatures: "odl-restconf,odl-netconf,odl-vbd,odl-groupbasedpolicy-neutron-vpp-mapper,odl-groupbasedpolicy-vpp" NeutronEnableForceMetadata: true NeutronMechanismDrivers: 'opendaylight_v2' NeutronServicePlugins: 'odl-router_v2' |