diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 20:08:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 20:08:56 +0000 |
| commit | a92f1f0d3f714c180db314a963c6b9cb27772b9c (patch) | |
| tree | 53c6a1ef1a9e2427969a34670eb3a60f196381e4 /ceilometer/cmd | |
| parent | 46f41ae5907b1fcdd41ddb40392ce9d29ce3d341 (diff) | |
| parent | 18ad1c15192943cc8dab3867c54d59cbbfca628e (diff) | |
| download | ceilometer-a92f1f0d3f714c180db314a963c6b9cb27772b9c.tar.gz | |
Merge "Don't require gnocchiclient"
Diffstat (limited to 'ceilometer/cmd')
| -rw-r--r-- | ceilometer/cmd/storage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometer/cmd/storage.py b/ceilometer/cmd/storage.py index 4944bbf1..aac50b81 100644 --- a/ceilometer/cmd/storage.py +++ b/ceilometer/cmd/storage.py @@ -21,7 +21,6 @@ import six.moves.urllib.parse as urlparse import sqlalchemy as sa from ceilometer.i18n import _LE, _LI, _LW -from ceilometer import gnocchi_client from ceilometer import service from ceilometer import storage @@ -58,6 +57,7 @@ def upgrade(default_skip_gnocchi_resource_types=False): LOG.info("Skipping Gnocchi resource types upgrade") else: LOG.debug("Upgrading Gnocchi resource types") + from ceilometer import gnocchi_client gnocchi_client.upgrade_resource_types(cfg.CONF) |