Merge "Add a directory for overcloud heat environments"

2 files changed, 29 insertions, 0 deletions

diff --git a/environments/README.md b/environments/README.md
new file mode 100644
index 00000000..4111f7ed
--- /dev/null
+++ b/environments/README.md
@@ -0,0 +1,13 @@
+This directory contains Heat environment file snippets which can
+be used to enable features in the Overcloud.
+
+Configuration
+-------------
+
+These can be enabled using the -e [path to environment yaml] option with
+heatclient.
+
+Below is an example of how to enable the Ceph template using
+devtest\_overcloud.sh:
+
+    export OVERCLOUD\_CUSTOM\_HEAT\_ENV=$TRIPLEO\_ROOT/tripleo-heat-templates/environments/ceph_devel.yaml
diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml
new file mode 100644
index 00000000..d782e8d8
--- /dev/null
+++ b/environments/puppet-ceph-devel.yaml
@@ -0,0 +1,16 @@
+# A Heat environment file which can be used to enable a Ceph
+# storage cluster using the controller and 2 ceph nodes.
+# Rbd backends are enabled for Cinder, Glance, and Nova.
+parameters:
+  CephStorageCount: 2
+  #NOTE: These ID's and keys should be regenerated for
+  # a production deployment. What is here is suitable for
+  # developer and CI testing only.
+  CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
+  CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
+  CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
+  NovaEnableRbdBackend: true
+  CinderEnableRbdBackend: true
+  GlanceBackend: rbd
+  CinderEnableIscsiBackend: false
+  ControllerEnableCephStorage: true