added config into common, renamed id for radosgw config
Change-Id: I6e548307535c29aee10817fe5ca85a0a03f7ded6
diff --git a/ceph/common.sls b/ceph/common.sls
index 4e17805..d3ff157 100644
--- a/ceph/common.sls
+++ b/ceph/common.sls
@@ -4,6 +4,14 @@
pkg.installed:
- names: {{ common.pkgs }}
+base_config:
+ file.managed:
+ - name: /etc/ceph/ceph.conf
+ - source: salt://ceph/files/{{ common.version }}/ceph.conf.{{ grains.os_family }}
+ - template: jinja
+ - require:
+ - pkg: base_packages
+
{% for keyring_name, keyring in common.get('keyring', {}).iteritems() %}
/etc/ceph/ceph.client.{{ keyring_name }}.keyring:
diff --git a/ceph/radosgw.sls b/ceph/radosgw.sls
index d0896c7..0fbb605 100644
--- a/ceph/radosgw.sls
+++ b/ceph/radosgw.sls
@@ -8,8 +8,9 @@
pkg.installed:
- names: {{ radosgw.pkgs }}
-/etc/ceph/ceph.conf:
+radosgw_config:
file.managed:
+ - name: /etc/ceph/ceph.conf
- source: salt://ceph/files/{{ common.version }}/ceph.conf.{{ grains.os_family }}
- template: jinja
- require: