radosgw fixes in formula
Change-Id: I56a3dab3c4d836dd3c75c4b5d1e231f9b7204e04
diff --git a/ceph/radosgw.sls b/ceph/radosgw.sls
index 98a6707..c428e7d 100644
--- a/ceph/radosgw.sls
+++ b/ceph/radosgw.sls
@@ -1,4 +1,4 @@
-{%- from "ceph/map.jinja" import radosgw with context %}
+{%- from "ceph/map.jinja" import radosgw, common with context %}
{%- if radosgw.enabled %}
include:
@@ -8,6 +8,13 @@
pkg.installed:
- names: {{ radosgw.pkgs }}
+/etc/ceph/ceph.conf:
+ file.managed:
+ - source: salt://ceph/files/{{ common.version }}/ceph.conf.{{ grains.os_family }}
+ - template: jinja
+ - require:
+ - pkg: ceph_radosgw_packages
+
/var/lib/ceph/radosgw/ceph-radosgw.gateway/done:
file.touch:
- makedirs: true
diff --git a/metadata/service/radosgw/single.yml b/metadata/service/radosgw/single.yml
index 2fffa4c..d4b532e 100644
--- a/metadata/service/radosgw/single.yml
+++ b/metadata/service/radosgw/single.yml
@@ -1,6 +1,7 @@
applications:
- ceph
classes:
+- service.ceph.common.cluster
- service.ceph.support
parameters:
_param:
@@ -10,4 +11,4 @@
enabled: true
hostname: ${_param:ceph_radosgw_hostname}
bind:
- address: ${_param:single_address}
\ No newline at end of file
+ address: ${_param:single_address}