projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Openstack plugins
[osm/MON.git]
/
plugins
/
OpenStack
/
Gnocchi
/
plugin_instance.py
diff --git
a/plugins/OpenStack/Gnocchi/plugin_instance.py
b/plugins/OpenStack/Gnocchi/plugin_instance.py
index
8e4296f
..
7b516e8
100644
(file)
--- a/
plugins/OpenStack/Gnocchi/plugin_instance.py
+++ b/
plugins/OpenStack/Gnocchi/plugin_instance.py
@@
-23,6
+23,11
@@
import logging as log
import logging as log
+try:
+ import gnocchiclient
+except ImportError:
+ log.warn("Gnocchiclient could not be imported")
+
from plugins.OpenStack.Gnocchi.metrics import Metrics
from plugins.OpenStack.settings import Config
from plugins.OpenStack.Gnocchi.metrics import Metrics
from plugins.OpenStack.settings import Config
@@
-56,4
+61,5
@@
class Plugin(object):
log.info("Initialize metric functionality.")
self._metrics.metric_calls()
log.info("Initialize metric functionality.")
self._metrics.metric_calls()
-register_plugin()
+if gnocchiclient:
+ register_plugin()