Merge "add requirements of ceph.conf in for states generating/updating keyrings"
diff --git a/ceph/common.sls b/ceph/common.sls
index 751c0ad..d312704 100644
--- a/ceph/common.sls
+++ b/ceph/common.sls
@@ -18,19 +18,21 @@
{{ common.prefix_dir }}/etc/ceph:
file.directory:
+ {% if not common.get('container_mode', False) %}
- user: ceph
- group: ceph
+ {%- endif %}
- mode: 755
- makedirs: True
common_config:
file.managed:
- name: {{ common.prefix_dir }}/etc/ceph/{{ ceph_cluster }}.conf
- - user: ceph
- - group: ceph
- source: salt://ceph/files/{{ common.version }}/ceph.conf.{{ grains.os_family }}
- template: jinja
{% if not common.get('container_mode', False) %}
+ - user: ceph
+ - group: ceph
- require:
- pkg: common_packages
{%- endif %}