openstack/ceilometer
Code Issues Proposed changes

Merge "Don't require gnocchiclient"

Browse Source
This commit is contained in:
Jenkins
2016-09-14 20:08:56 +00:00
committed by Gerrit Code Review
parent 46f41ae590 18ad1c1519
commit a92f1f0d3f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/cmd/storage.py
View File

@@ -21,7 +21,6 @@ import six.moves.urllib.parse as urlparse
import sqlalchemy as sa import sqlalchemy as sa
from ceilometer.i18n import _LE, _LI, _LW from ceilometer.i18n import _LE, _LI, _LW
from ceilometer import gnocchi_client
from ceilometer import service from ceilometer import service
from ceilometer import storage from ceilometer import storage
@@ -58,6 +57,7 @@ def upgrade(default_skip_gnocchi_resource_types=False):
LOG.info("Skipping Gnocchi resource types upgrade") LOG.info("Skipping Gnocchi resource types upgrade")
else: else:
LOG.debug("Upgrading Gnocchi resource types") LOG.debug("Upgrading Gnocchi resource types")
from ceilometer import gnocchi_client
gnocchi_client.upgrade_resource_types(cfg.CONF) gnocchi_client.upgrade_resource_types(cfg.CONF)