openstack/watcher
Code Issues Proposed changes

Merge "make ceilometer client import optional"

Browse Source
This commit is contained in:
Zuul
2019-03-04 04:32:33 +00:00
committed by Gerrit Code Review
parent 2ea1f524e4 ea728d91ab
commit f19e0539b6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/common/clients.py
View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from ceilometerclient import client as ceclient
from cinderclient import client as ciclient
from glanceclient import client as glclient
from gnocchiclient import client as gnclient
@ -25,6 +25,12 @@ from watcher.common import exception
from watcher import conf
try:
from ceilometerclient import client as ceclient
HAS_CEILCLIENT = True
except ImportError:
HAS_CEILCLIENT = False
CONF = conf.CONF
_CLIENTS_AUTH_GROUP = 'watcher_clients_auth'