aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-16 19:08:30 +0000
committerGerrit Code Review <review@openstack.org>2016-09-16 19:08:30 +0000
commite53b245b75b4044e1e08d653dd5b94c5104195b7 (patch)
tree786103d21564576dc14831b2ff12e3ae476422e8 /environments
parenta4c0f2c8ab2853a8861a931ba7b4f9a8aad12a66 (diff)
parentdff4f6ca0cd926368e6231db71092028c0faca82 (diff)
Merge "Add hyperconverged-ceph environment to include CephOSD on computes"
Diffstat (limited to 'environments')
-rw-r--r--environments/hyperconverged-ceph.yaml12
1 files changed, 12 insertions, 0 deletions
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