From 331e8451c6130fa6ce5d356a52c94f2ac78f4190 Mon Sep 17 00:00:00 2001
From: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
Date: Thu, 20 Sep 2018 04:35:29 +0300
Subject: [PATCH] modify default_caps to match current ceph-mon caps

The current default caps in ceph-proxy are not up to date with
charm-ceph-mon caps.

Change-Id: Iaeb8d4dea9c36f522aeaddf54b19e4947c81a559
Closes-Bug: #1794071
---
 hooks/ceph.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hooks/ceph.py b/hooks/ceph.py
index 44b2849..f352f53 100644
--- a/hooks/ceph.py
+++ b/hooks/ceph.py
@@ -11,6 +11,7 @@ import time
 import os
 import re
 import sys
+import collections
 
 from charmhelpers.contrib.storage.linux.utils import (
     is_block_device,
@@ -343,10 +344,11 @@ def get_radosgw_key():
     return get_named_key('radosgw.gateway', _radosgw_caps)
 
 
-_default_caps = {
-    'mon': ['allow rw'],
-    'osd': ['allow rwx']
-}
+_default_caps = collections.OrderedDict([
+    ('mon', ['allow r',
+             'allow command "osd blacklist"']),
+    ('osd', ['allow rwx']),
+])
 
 admin_caps = {
     'mds': ['allow'],