7 files changed, 118 insertions, 0 deletions
diff --git a/environments/inject-trust-anchor-hiera.yaml b/environments/inject-trust-anchor-hiera.yaml
new file mode 100644
index 00000000..b4908c1b
--- /dev/null
+++ b/environments/inject-trust-anchor-hiera.yaml
@@ -0,0 +1,8 @@
+parameter_defaults:
+  CAMap:
+    first-ca-name:
+      content: |
+        The content of the CA cert goes here
+    second-ca-name:
+      content: |
+        The content of the CA cert goes here
diff --git a/environments/monitoring-environment.yaml b/environments/monitoring-environment.yaml
new file mode 100644
index 00000000..a8ad2084
--- /dev/null
+++ b/environments/monitoring-environment.yaml
@@ -0,0 +1,30 @@
+## A Heat environment file which can be used to set up monitoring
+## and logging agents
+
+resource_registry:
+  OS::TripleO::Services::SensuClient: ../puppet/services/monitoring/sensu-client.yaml
+
+parameter_defaults:
+  #### Sensu settings ####
+  ##MonitoringRabbitHost: 10.10.10.10
+  ##MonitoringRabbitPort: 5672
+  ##MonitoringRabbitUserName: sensu
+  ##MonitoringRabbitPassword: sensu
+  ##MonitoringRabbitUseSSL: false
+  ##MonitoringRabbitVhost: "/sensu"
+  ##SensuClientCustomConfig:
+  ##  - api:
+  ##    - warning: 10
+  ##      critical: 20
+  ##    openstack:
+  ##    - username: admin
+  ##      password: changeme
+  ##      project_name: admin
+  ##      auth_url: http://controller:5000/v2.0
+  ##      region_name: RegionOne
+
+  #### EFK settings ####
+  ## TBD
+
+  #### Grafana/Graphite settings ####
+  ## TBD
diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml
new file mode 100644
index 00000000..d61270b2
--- /dev/null
+++ b/environments/neutron-opendaylight-l3.yaml
@@ -0,0 +1,14 @@
+# A Heat environment that can be used to deploy OpenDaylight with L3 DVR
+resource_registry:
+  OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::OpenDaylight: puppet/services/opendaylight-api.yaml
+  OS::TripleO::Services::OpenDaylightOvs: puppet/services/opendaylight-ovs.yaml
+  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+
+parameter_defaults:
+  EnableOpenDaylightOnController: true
+  NeutronEnableForceMetadata: true
+  NeutronMechanismDrivers: 'opendaylight'
+  NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
+  OpenDaylightEnableL3: "'yes'"
diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml
new file mode 100644
index 00000000..8fa2e542
--- /dev/null
+++ b/environments/neutron-opendaylight.yaml
@@ -0,0 +1,11 @@
+# A Heat environment that can be used to deploy OpenDaylight
+resource_registry:
+  OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::OpenDaylight: puppet/services/opendaylight-api.yaml
+  OS::TripleO::Services::OpenDaylightOvs: puppet/services/opendaylight-ovs.yaml
+
+parameter_defaults:
+  EnableOpenDaylightOnController: true
+  NeutronEnableForceMetadata: true
+  NeutronMechanismDrivers: 'opendaylight'
diff --git a/environments/neutron-ovs-dpdk.yaml b/environments/neutron-ovs-dpdk.yaml
new file mode 100644
index 00000000..004b8ac0
--- /dev/null
+++ b/environments/neutron-ovs-dpdk.yaml
@@ -0,0 +1,18 @@
+## A Heat environment that can be used to deploy DPDK with OVS
+resource_registry:
+  OS::TripleO::Services::ComputeNeutronOvsAgent: ../puppet/services/neutron-ovs-dpdk-agent.yaml
+
+parameter_defaults:
+  ## NeutronDpdkCoreList and NeutronDpdkMemoryChannels are REQUIRED settings.
+  ## Attempting to deploy DPDK without appropriate values will cause deployment to fail or lead to unstable deployments.
+  #NeutronDpdkCoreList: ""
+  #NeutronDpdkMemoryChannels: ""
+
+  NeutronDatapathType: "netdev"
+  NeutronVhostuserSocketDir: "/var/run/openvswitch"
+
+  #NeutronDpdkSocketMemory: ""
+  #NeutronDpdkDriverType: "vfio-pci"
+  #NovaReservedHostMemory: 4096
+  #NovaVcpuPinSet: ""
+
diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml
index 223c2531..b658d3a5 100644
--- a/environments/neutron-ovs-dvr.yaml
+++ b/environments/neutron-ovs-dvr.yaml
@@ -9,6 +9,13 @@ resource_registry:
   # connected to a physical network.
   OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
 
+  # DVR requires a port on the external network for each compute node.
+  # This will usually match the one currently in use for
+  # OS::TripleO::Controller::Ports::ExternalPort.
+  # Please review your network configuration before deploying to ensure that
+  # this is appropriate.
+  OS::TripleO::Compute::Ports::ExternalPort: ../network/ports/noop.yaml
+
 parameter_defaults:
 
   # DVR requires that the L2 population feature is enabled
@@ -22,3 +29,11 @@ parameter_defaults:
   # We also need to set the proper agent mode for the L3 agent.  This will only
   # affect the agent on the controller node.
   NeutronL3AgentMode: 'dvr_snat'
+
+  # L3 HA isn't supported for DVR enabled routers. If upgrading from a system
+  # where L3 HA is enabled and has neutron routers configured, it is
+  # recommended setting this value to true until such time all routers can be
+  # migrated to DVR routers. Once migration of the routers is complete,
+  # NeutronL3HA can be returned to false. All new systems should be deployed
+  # with NeutronL3HA set to false.
+  NeutronL3HA: false
diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml
new file mode 100755
index 00000000..9b7e51f9
--- /dev/null
+++ b/environments/neutron-sriov.yaml
@@ -0,0 +1,22 @@
+## A Heat environment that can be used to deploy SR-IOV
+resource_registry:
+  OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
+
+parameter_defaults:
+  NeutronMechanismDrivers: ['openvswitch','sriovnicswitch']
+
+  # Add PciPassthroughFilter to the scheduler default filters
+  #NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
+  #NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
+
+  # Provide the vendorid:productid of the VFs
+  #NeutronSupportedPCIVendorDevs: ['8086:154c','8086:10ca','8086:1520']
+
+  #NeutronPhysicalDevMappings: "datacentre:ens20f2"
+
+  # Number of VFs that needs to be configured for a physical interface
+  #NeutronSriovNumVFs: "ens20f2:5"
+
+  #NovaPCIPassthrough:
+  #  - devname: "ens20f2"
+  #    physical_network: "datacentre"