4 files changed, 84 insertions, 0 deletions
diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml
new file mode 100644
index 00000000..704f1e7f
--- /dev/null
+++ b/environments/neutron-ml2-vpp.yaml
@@ -0,0 +1,23 @@
+# Environment file used to enable networking-vpp ML2 mechanism driver
+
+resource_registry:
+  OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::NeutronVppAgent: ../puppet/services/neutron-vpp-agent.yaml
+  OS::TripleO::Services::Etcd: ../puppet/services/etcd.yaml
+  OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml
+
+parameter_defaults:
+  #Comma delimited list of <physical_network>:<VPP Interface>.
+  #Example: "datacentre:GigabitEthernet2/2/0"
+  #NeutronVPPAgentPhysnets: ""
+
+  NeutronMechanismDrivers: vpp
+  NeutronNetworkType: vlan
+  NeutronServicePlugins: router
+  NeutronL3HA: false
+  NeutronTypeDrivers: vlan,flat
+  ExtraConfig:
+    # Use Linux Bridge driver for DHCP and L3 agent.
+    neutron::agents::dhcp::interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver"
+    neutron::agents::l3::interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver"
diff --git a/environments/neutron-opendaylight-honeycomb.yaml b/environments/neutron-opendaylight-honeycomb.yaml
new file mode 100644
index 00000000..6837fbe1
--- /dev/null
+++ b/environments/neutron-opendaylight-honeycomb.yaml
@@ -0,0 +1,26 @@
+# A Heat environment that can be used to deploy OpenDaylight with Honeycomb Agent
+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::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.yaml
+  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+
+parameter_defaults:
+  NeutronNetworkType: 'vxlan'
+  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"
+  NeutronEnableForceMetadata: true
+  NeutronMechanismDrivers: 'opendaylight_v2'
+  NeutronServicePlugins: 'odl-router_v2'
+  #Opendaylight Port binding controller
+  OpenDaylightPortBindingController: 'pseudo-agentdb-binding'
+  #URI for neutron hostconfig in Opendaylight
+  OpenDaylightHostconfURI: 'restconf/operational/neutron:neutron/hostconfigs'
+  ExtraConfig:
+    neutron::agents::dhcp::interface_driver: "neutron.agent.linux.interface.NSDriver"
diff --git a/environments/neutron-opendaylight-netvirt-vpp.yaml b/environments/neutron-opendaylight-netvirt-vpp.yaml
new file mode 100644
index 00000000..94e56795
--- /dev/null
+++ b/environments/neutron-opendaylight-netvirt-vpp.yaml
@@ -0,0 +1,26 @@
+# A Heat environment that can be used to deploy OpenDaylight with Honeycomb Agent
+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::NeutronHoneycombAgent: ../puppet/services/neutron-odl-honeycomb-agent.yaml
+  OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml
+  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+
+parameter_defaults:
+  NeutronNetworkType: 'vxlan'
+  NeutronL3HA: false
+  #NUMATopologyFilter is required for vhostuser interfaces
+  #NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
+  OpenDaylightFeatures: "odl-neutron-hostconfig-vpp,odl-netvirt-openstack"
+  NeutronEnableForceMetadata: true
+  NeutronMechanismDrivers: 'opendaylight_v2'
+  NeutronServicePlugins: 'odl-router_v2'
+  OpenDaylightEnableL3: "'yes'"
+  #Opendaylight Port binding controller
+  OpenDaylightPortBindingController: 'pseudo-agentdb-binding'
+  #URI for neutron hostconfig in Opendaylight
+  OpenDaylightHostconfURI: 'restconf/operational/neutron:neutron/hostconfigs'
+  ExtraConfig:
+    neutron::agents::dhcp::interface_driver: "neutron.agent.linux.interface.NSDriver"
diff --git a/environments/services/vpp.yaml b/environments/services/vpp.yaml
new file mode 100644
index 00000000..9bad70f8
--- /dev/null
+++ b/environments/services/vpp.yaml
@@ -0,0 +1,9 @@
+resource_registry:
+  OS::TripleO::Services::Vpp: ../../puppet/services/vpp.yaml
+
+#parameter_defaults:
+  #VPP main thread core pinning
+  #VppCpuMainCore: '1'
+
+  #List of cores for VPP worker thread pinning
+  #VppCpuCorelistWorkers: ['3','4']