From 6482296131bd2c73db4f59f7b53b61f4ffba9739 Mon Sep 17 00:00:00 2001 From: Masahito Muroi Date: Tue, 13 Mar 2018 11:36:56 +0900 Subject: [PATCH] Remove climate namespace Change-Id: I21089701a46db40ec46444f76d1afef6ae0ffff0 Closes-Bug: #1755325 Depends-On: https://review.openstack.org/#/c/552254 --- blazar/db/sqlalchemy/models.py | 7 ------- blazar/db/utils.py | 2 +- blazar/plugins/oshosts/host_plugin.py | 1 - .../notes/remove-climate-fb62d72ca8fc5c7d.yaml | 4 ++++ setup.cfg | 11 ----------- 5 files changed, 5 insertions(+), 20 deletions(-) create mode 100644 releasenotes/notes/remove-climate-fb62d72ca8fc5c7d.yaml diff --git a/blazar/db/sqlalchemy/models.py b/blazar/db/sqlalchemy/models.py index 123779d1..0fbf48fc 100644 --- a/blazar/db/sqlalchemy/models.py +++ b/blazar/db/sqlalchemy/models.py @@ -14,8 +14,6 @@ # limitations under the License. -# FIXME: https://bugs.launchpad.net/climate/+bug/1300132 -# from oslo_log import log as logging from oslo_utils import uuidutils import six import sqlalchemy as sa @@ -23,8 +21,6 @@ from sqlalchemy.dialects.mysql import MEDIUMTEXT from sqlalchemy.orm import relationship from blazar.db.sqlalchemy import model_base as mb -# FIXME: https://bugs.launchpad.net/climate/+bug/1300132 -# LOG = logging.getLogger(__name__) # Helpers @@ -119,9 +115,6 @@ class Reservation(mb.BlazarBase): minMax = res['count_range'].split('-', 1) (d['min'], d['max']) = map(int, minMax) except ValueError: - # FIXME: https://bugs.launchpad.net/climate/+bug/1300132 - # LOG.error( - # "Invalid Range: {0}".format(res['count_range'])) e = "Invalid count range: {0}".format(res['count_range']) raise RuntimeError(e) diff --git a/blazar/db/utils.py b/blazar/db/utils.py index 51aa3749..501d7c06 100644 --- a/blazar/db/utils.py +++ b/blazar/db/utils.py @@ -28,7 +28,7 @@ interface. `sqlalchemy` is the only supported backend right now. :sql_connection: string specifying the sqlalchemy connection to use, like: - `sqlite:///var/lib/climate/climate.sqlite`. + `sqlite:///var/lib/blazar/blazar.sqlite`. """ diff --git a/blazar/plugins/oshosts/host_plugin.py b/blazar/plugins/oshosts/host_plugin.py index ad990275..ed980a9f 100644 --- a/blazar/plugins/oshosts/host_plugin.py +++ b/blazar/plugins/oshosts/host_plugin.py @@ -44,7 +44,6 @@ plugin_opts = [ help='Actions which we will use at the start of the lease'), cfg.StrOpt('blazar_az_prefix', default='blazar_', - deprecated_name='climate_az_prefix', help='Prefix for Availability Zones created by Blazar'), cfg.StrOpt('before_end', default='', diff --git a/releasenotes/notes/remove-climate-fb62d72ca8fc5c7d.yaml b/releasenotes/notes/remove-climate-fb62d72ca8fc5c7d.yaml new file mode 100644 index 00000000..f96525ca --- /dev/null +++ b/releasenotes/notes/remove-climate-fb62d72ca8fc5c7d.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + All climate namespace is removed in Rocky release. \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 5dcb1a02..b43a6acd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,12 +29,6 @@ packages = [entry_points] console_scripts = - # Remove this alias when the deprecation period of "climate" is over - climate-db-manage=blazar.db.migration.cli:main - climate-api=blazar.cmd.api:main - climate-rpc-zmq-receiver=blazar.cmd.rpc_zmq_receiver:main - climate-manager=blazar.cmd.manager:main - blazar-db-manage=blazar.db.migration.cli:main blazar-api=blazar.cmd.api:main blazar-rpc-zmq-receiver=blazar.cmd.rpc_zmq_receiver:main @@ -45,11 +39,6 @@ blazar.resource.plugins = physical.host.plugin=blazar.plugins.oshosts.host_plugin:PhysicalHostPlugin virtual.instance.plugin=blazar.plugins.instances.instance_plugin:VirtualInstancePlugin -# Remove this alias when the deprecation period of "climate" is over -climate.api.v2.controllers.extensions = - oshosts=blazar.api.v2.controllers.extensions.host:HostsController - leases=blazar.api.v2.controllers.extensions.lease:LeasesController - blazar.api.v2.controllers.extensions = oshosts=blazar.api.v2.controllers.extensions.host:HostsController leases=blazar.api.v2.controllers.extensions.lease:LeasesController