openstack
/
charm-ceph-proxy
Code Issues Proposed changes

Fix lint re: py3-first and py2 compat 

Change-Id: I2018de28dc4a3767af91a76b9ad8dd1175bec513
This commit is contained in:
Ryan Beisner 2018-11-02 09:39:29 -05:00
parent 45a26002f1
commit 48c5998a0c
No known key found for this signature in database
GPG Key ID: 952BACDC1C1A05FB
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/ceph_broker.py
View File

@ -3,6 +3,7 @@
# Copyright 2015 Canonical Ltd. # Copyright 2015 Canonical Ltd.
# #
import json import json
import six
from charmhelpers.core.hookenv import ( from charmhelpers.core.hookenv import (
log, log,
@ -27,6 +28,7 @@ from charmhelpers.contrib.storage.linux.ceph import (
ReplicatedPool, ReplicatedPool,
) )
# This comes from http://docs.ceph.com/docs/master/rados/operations/pools/ # This comes from http://docs.ceph.com/docs/master/rados/operations/pools/
# This should do a decent job of preventing people from passing in bad values. # This should do a decent job of preventing people from passing in bad values.
# It will give a useful error message # It will give a useful error message
@ -44,8 +46,8 @@ POOL_KEYS = {
"write_fadvise_dontneed": [bool], "write_fadvise_dontneed": [bool],
"noscrub": [bool], "noscrub": [bool],
"nodeep-scrub": [bool], "nodeep-scrub": [bool],
"hit_set_type": [basestring, ["bloom", "explicit_hash", "hit_set_type": [six.string_types, ["bloom", "explicit_hash",
"explicit_object"]], "explicit_object"]],
"hit_set_count": [int, [1, 1]], "hit_set_count": [int, [1, 1]],
"hit_set_period": [int], "hit_set_period": [int],
"hit_set_fpp": [float, [0.0, 1.0]], "hit_set_fpp": [float, [0.0, 1.0]],