diff options
| author | Julien Danjou <julien@danjou.info> | 2016-10-19 15:02:20 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2016-10-21 12:36:16 +0200 |
| commit | 779673534fefc39633aed18bb020885bd6020e06 (patch) | |
| tree | eb97c2a6ee52808d30522e6efa3c07af8d04452c /ceilometer/cmd | |
| parent | 97183a872b9b334def0e17864be4b2338ab3e47f (diff) | |
| download | ceilometer-779673534fefc39633aed18bb020885bd6020e06.tar.gz | |
Remove deprecated ceilometer-dbsync
Change-Id: Ib7875909cc6b997fb25003cbd48eb1434b20fd35
Diffstat (limited to 'ceilometer/cmd')
| -rw-r--r-- | ceilometer/cmd/storage.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ceilometer/cmd/storage.py b/ceilometer/cmd/storage.py index aac50b81..e21345da 100644 --- a/ceilometer/cmd/storage.py +++ b/ceilometer/cmd/storage.py @@ -20,14 +20,14 @@ from six import moves import six.moves.urllib.parse as urlparse import sqlalchemy as sa -from ceilometer.i18n import _LE, _LI, _LW +from ceilometer.i18n import _LE, _LI from ceilometer import service from ceilometer import storage LOG = log.getLogger(__name__) -def upgrade(default_skip_gnocchi_resource_types=False): +def upgrade(): cfg.CONF.register_cli_opts([ cfg.BoolOpt('skip-metering-database', help='Skip metering database upgrade.', @@ -37,7 +37,7 @@ def upgrade(default_skip_gnocchi_resource_types=False): default=False), cfg.BoolOpt('skip-gnocchi-resource-types', help='Skip gnocchi resource-types upgrade.', - default=default_skip_gnocchi_resource_types), + default=False), ]) service.prepare_service() @@ -61,12 +61,6 @@ def upgrade(default_skip_gnocchi_resource_types=False): gnocchi_client.upgrade_resource_types(cfg.CONF) -def dbsync(): - LOG.warning(_LW('ceilometer-dbsync is deprecated in favor of ' - 'ceilometer-upgrade')) - upgrade(default_skip_gnocchi_resource_types=True) - - def expirer(): service.prepare_service() |