From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 6 Jul 2016 08:51:42 +0000 (+0200)
Subject: Add hyperconverged-ceph environment to include CephOSD on computes
X-Git-Tag: opnfv-6.0.0~1602^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dff4f6ca0cd926368e6231db71092028c0faca82;p=apex-tripleo-heat-templates.git

Add hyperconverged-ceph environment to include CephOSD on computes

This would be useful to test Ceph in CI without a dedicated OSD node.

Change-Id: Ie534d327a9418b6119f5811ee62d448795879fb0
---

diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml
new file mode 100644
index 00000000..87ebb1d7
--- /dev/null
+++ b/environments/hyperconverged-ceph.yaml
@@ -0,0 +1,12 @@
+# If using an isolated StorageMgmt network, this will have to be uncommented to
+# plug the network on the compute nodes as well.
+#resource_registry:
+#    OS::TripleO::Compute::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
+
+# Should match the default list of services for the compute node plus CephOSD
+parameter_defaults:
+  ComputeServices:
+    - OS::TripleO::Services::CephOSD
+
+parameter_merge_strategies:
+  ComputeServices: merge
\ No newline at end of file