11 files changed, 166 insertions, 2 deletions
diff --git a/environments/config-debug.yaml b/environments/config-debug.yaml
new file mode 100644
index 00000000..b176c255
--- /dev/null
+++ b/environments/config-debug.yaml
@@ -0,0 +1,5 @@
+# A Heat environment file which can be used to enable config
+# management (e.g. Puppet) debugging.
+
+parameter_defaults:
+  ConfigDebug: true
diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
new file mode 100644
index 00000000..8a6e1018
--- /dev/null
+++ b/environments/docker-rdo.yaml
@@ -0,0 +1,17 @@
+resource_registry:
+  # Docker container with heat agents for containerized compute node.
+  OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
+  OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
+
+parameters:
+  NovaImage: atomic-image
+
+parameter_defaults:
+  DockerComputeImage: rthallisey/centos-binary-nova-compute:liberty
+  DockerComputeDataImage: kollaglue/centos-rdo-nova-compute-data:liberty2
+  DockerLibvirtImage: kollaglue/centos-rdo-nova-libvirt:liberty2
+  DockerNeutronAgentImage: kollaglue/centos-rdo-neutron-agents:liberty2
+  DockerOpenvswitchImage: rthallisey/centos-rdo-neutron-openvswitch-agent:latest
+  DockerOvsVswitchdImage: kollaglue/centos-rdo-ovs-vswitchd:liberty2
+  DockerOpenvswitchDBImage: kollaglue/centos-rdo-ovs-db-server:liberty2
diff --git a/environments/net-bond-with-vlans-no-external.yaml b/environments/net-bond-with-vlans-no-external.yaml
new file mode 100644
index 00000000..0da119d9
--- /dev/null
+++ b/environments/net-bond-with-vlans-no-external.yaml
@@ -0,0 +1,26 @@
+# This template configures each role to use a pair of bonded nics (nic2 and
+# nic3) and configures an IP address on each relevant isolated network
+# for each role.
+
+# This template assumes use of network-isolation.yaml and should be specified
+# last on the CLI as a Heat environment so as to override specific
+# registry settings in the network-isolation registry.
+#
+# FIXME: if/when we add functionality to heatclient to include heat
+# environment files we should think about using it here to automatically
+# include network-isolation.yaml.
+resource_registry:
+
+  # Set external ports to noop
+  OS::TripleO::Network::External: ../network/noop.yaml
+  OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
+
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-no-external.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
+
+# NOTE: with no external interface we should be able to use the
+# default Neutron l3_agent.ini setting for the external bridge (br-ex)
+# i.e. No need to set:  NeutronExternalNetworkBridge: "''"
diff --git a/environments/net-multiple-nics.yaml b/environments/net-multiple-nics.yaml
new file mode 100644
index 00000000..5ee516fb
--- /dev/null
+++ b/environments/net-multiple-nics.yaml
@@ -0,0 +1,13 @@
+# This template configures each role to use a separate NIC for
+# each isolated network.
+# This template assumes use of network-isolation.yaml.
+#
+# FIXME: if/when we add functionality to heatclient to include heat
+# environment files we should think about using it here to automatically
+# include network-isolation.yaml.
+resource_registry:
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/multiple-nics/cinder-storage.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/multiple-nics/compute.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/multiple-nics/controller.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/multiple-nics/swift-storage.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/multiple-nics/ceph-storage.yaml
diff --git a/environments/net-single-nic-with-vlans-no-external.yaml b/environments/net-single-nic-with-vlans-no-external.yaml
new file mode 100644
index 00000000..a173df4e
--- /dev/null
+++ b/environments/net-single-nic-with-vlans-no-external.yaml
@@ -0,0 +1,25 @@
+# This template configures each role to use Vlans on a single nic for
+# each isolated network.
+# This template assumes use of network-isolation.yaml and should be specified
+# last on the CLI as a Heat environment so as to override specific
+# registry settings in the network-isolation registry.
+#
+# FIXME: if/when we add functionality to heatclient to include heat
+# environment files we should think about using it here to automatically
+# include network-isolation.yaml.
+resource_registry:
+
+  # Set external ports to noop
+  OS::TripleO::Network::External: ../network/noop.yaml
+  OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
+
+  # Configure other ports as normal
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/cinder-storage.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/single-nic-vlans/compute.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml
+
+# NOTE: with no external interface we should be able to use the
+# default Neutron l3_agent.ini setting for the external bridge (br-ex)
+# i.e. No need to set:  NeutronExternalNetworkBridge: "''"
diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml
new file mode 100644
index 00000000..69c91326
--- /dev/null
+++ b/environments/neutron-ml2-bigswitch.yaml
@@ -0,0 +1,17 @@
+# A Heat environment file which can be used to enable Big Switch
+# extensions, configured via puppet
+resource_registry:
+  OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
+
+parameter_defaults:
+  # Required to fill in:
+  NeutronBigswitchRestproxyServers:
+  NeutronBigswitchRestproxyServerAuth:
+
+  # Optional:
+  # NeutronBigswitchRestproxyAutoSyncOnFailure:
+  # NeutronBigswitchRestproxyConsistencyInterval:
+  # NeutronBigswitchRestproxyNeutronId:
+  # NeutronBigswitchRestproxyServerSsl:
+  # NeutronBigswitchRestproxySslCertDirectory:
+
diff --git a/environments/neutron-ml2-cisco-n1kv.yaml b/environments/neutron-ml2-cisco-n1kv.yaml
new file mode 100644
index 00000000..651e9564
--- /dev/null
+++ b/environments/neutron-ml2-cisco-n1kv.yaml
@@ -0,0 +1,11 @@
+# A Heat environment file which can be used to enable a
+# a Cisco N1KV backend, configured via puppet
+resource_registry:
+  OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
+  OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
+
+parameter_defaults:
+  N1000vVSMIP: '192.0.2.50'
+  N1000vMgmtGatewayIP: '192.0.2.1'
+  N1000vVSMDomainID: '100'
+  N1000vVSMHostMgmtIntf: 'br-ex'
diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
new file mode 100644
index 00000000..5a1a32a3
--- /dev/null
+++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -0,0 +1,25 @@
+# A Heat environment file which can be used to enable a
+# a Cisco Neutron plugin.
+resource_registry:
+  OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
+
+parameter_defaults:
+  NetworkUCSMIp: '127.0.0.1'
+  NetworkUCSMUsername: 'admin'
+  NetworkUCSMPassword: 'password'
+  NetworkUCSMHostList: '12:34:56:78:9a:bc:profile1, 12:34:56:78:9a:de:profile2'
+  NetworkUCSMSupportedPciDevs: ''
+  NetworkNexusConfig: {}
+  NetworkNexusManagedPhysicalNetwork: ''
+  NetworkNexusVlanNamePrefix: 'q-'
+  NetworkNexusSviRoundRobin: 'false'
+  NetworkNexusProviderVlanNamePrefix: 'p-'
+  NetworkNexusPersistentSwitchConfig: 'false'
+  NetworkNexusSwitchHeartbeatTime: 0
+  NetworkNexusSwitchReplayCount: 3
+  NetworkNexusProviderVlanAutoCreate: 'true'
+  NetworkNexusProviderVlanAutoTrunk: 'true'
+  NetworkNexusVxlanGlobalConfig: 'true'
+  NetworkNexusHostKeyChecks: 'false'
+  NetworkNexusVxlanVniRanges: '0:0'
+  NetworkNexusVxlanMcastRanges: '0.0.0.0:0.0.0.0'
diff --git a/environments/overcloud-steps.yaml b/environments/overcloud-steps.yaml
index 99f73688..f61cbb6f 100644
--- a/environments/overcloud-steps.yaml
+++ b/environments/overcloud-steps.yaml
@@ -1,7 +1,7 @@
 # Specifies hooks/breakpoints where overcloud deployment should stop
 # Allows operator validation between steps, and/or more granular control.
 # Note: the wildcards relate to naming convention for some resource suffixes,
-# e.g see puppet/*-post-puppet.yaml, enabling this will mean we wait for
+# e.g see puppet/*-post.yaml, enabling this will mean we wait for
 # a user signal on every *Deployment_StepN resource defined in those files.
 resource_registry:
   resources:
diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml
new file mode 100644
index 00000000..7f5b5080
--- /dev/null
+++ b/environments/puppet-ceph-external.yaml
@@ -0,0 +1,25 @@
+# A Heat environment file which can be used to enable the
+# use of an externally managed Ceph cluster.
+resource_registry:
+  OS::TripleO::CephClusterConfig::SoftwareConfig: ../puppet/extraconfig/ceph/ceph-external-config.yaml
+
+parameter_defaults:
+  # NOTE: These example parameters are required when using Ceph External
+  #CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
+  #CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
+  #CephExternalMonHost: '172.16.1.7, 172.16.1.8'
+
+  # the following parameters enable Ceph backends for Cinder, Glance, and Nova
+  NovaEnableRbdBackend: true
+  CinderEnableRbdBackend: true
+  GlanceBackend: rbd
+  # If the Ceph pools which host VMs, Volumes and Images do not match these
+  # names OR the client keyring to use is not named 'openstack',  edit the
+  # following as needed.
+  NovaRbdPoolName: vms
+  CinderRbdPoolName: volumes
+  GlanceRbdPoolName: images
+  CephClientUserName: openstack
+
+  # finally we disable the Cinder LVM backend
+  CinderEnableIscsiBackend: false
diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index 535ec6fe..5ccfa58e 100644
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -1,7 +1,7 @@
 ## A Heat environment file which can be used to set up storage
 ## backends. Defaults to Ceph used as a backend for Cinder, Glance and
 ## Nova ephemeral storage.
-parameters:
+parameter_defaults:
 
   #### BACKEND SELECTION ####