Merge "Avoid hardcoded path for BACKUPDIR var"
diff --git a/ceph/map.jinja b/ceph/map.jinja
index ae0206b..0dce94c 100644
--- a/ceph/map.jinja
+++ b/ceph/map.jinja
@@ -45,6 +45,7 @@
- ceph-common
- python-rados
- librados2
+ - psmisc
services:
{%- if grains.get('init', None) == 'systemd' %}
{%- if pillar.get('ceph',{}).get('radosgw',{}).keyring_user is defined %}
@@ -64,6 +65,7 @@
pkgs:
- radosgw
- ceph-common
+ - psmisc
services:
- radosgw-all
threads: 50
diff --git a/ceph/mon.sls b/ceph/mon.sls
index b660cdf..db172b9 100644
--- a/ceph/mon.sls
+++ b/ceph/mon.sls
@@ -54,7 +54,7 @@
- pkg: mon_packages
- file: common_config
-{%- if common.keyring.admin is not defined %}
+{%- if common.get('keyring', {}).admin is not defined %}
/var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring:
file.managed:
- source: salt://ceph/files/mon_keyring