Remove climate namespace

Change-Id: I21089701a46db40ec46444f76d1afef6ae0ffff0
Closes-Bug: #1755325
Depends-On: https://review.openstack.org/#/c/552254
This commit is contained in:
Masahito Muroi 2018-03-13 11:36:56 +09:00
parent fcef4ce011
commit 6482296131
5 changed files with 5 additions and 20 deletions

View File

@ -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)

View File

@ -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`.
"""

View File

@ -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='',

View File

@ -0,0 +1,4 @@
---
other:
- |
All climate namespace is removed in Rocky release.

View File

@ -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