Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
deployment: remove Step7
[apex-tripleo-heat-templates.git]
/
puppet
/
ceph-storage.yaml
diff --git
a/puppet/ceph-storage.yaml
b/puppet/ceph-storage.yaml
index
f26d07f
..
f0eb71e
100644
(file)
--- a/
puppet/ceph-storage.yaml
+++ b/
puppet/ceph-storage.yaml
@@
-256,6
+256,7
@@
resources:
- ceph
- '"%{::osfamily}"'
- common
+ merge_behavior: deeper
datafiles:
common:
raw_data: {get_file: hieradata/common.yaml}