diff --git a/.gitreview b/.gitreview index 424fb37e..81f73771 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org -port=29418 -project=openstack/ironic.git +#host=review.openstack.org +#port=29418 +#project=stackforge/tuskar.git diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index cc533227..5402c132 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,17 +1 @@ -If you would like to contribute to the development of OpenStack, -you must follow the steps in the "If you're a developer, start here" -section of this page: - - http://wiki.openstack.org/HowToContribute - -Once those steps have been completed, changes to OpenStack -should be submitted for review via the Gerrit tool, following -the workflow documented at: - - http://wiki.openstack.org/GerritWorkflow - -Pull requests submitted through GitHub will be ignored. - -Bugs should be filed on Launchpad, not GitHub: - - https://bugs.launchpad.net/ironic +Send pull requests! diff --git a/README.rst b/README.rst index 94f0b8c0..0d4a5d93 100644 --- a/README.rst +++ b/README.rst @@ -1,100 +1,21 @@ -Ironic +Tuskar ====== -Ironic is an Incubated OpenStack project which aims to provision -bare metal machines instead of virtual machines, forked from the -Nova Baremetal driver. It is best thought of as a bare metal -hypervisor **API** and a set of plugins which interact with -the bare metal hypervisors. By default, it will use PXE and IPMI -in concert to provision and turn on/off machines, but Ironic -also supports vendor-specific plugins which may implement additional -functionality. - ------------------ -Project Resources ------------------ - -Project status, bugs, and blueprints are tracked on Launchpad: - - http://launchpad.net/ironic - -Additional resources are linked from the project wiki page: - - https://wiki.openstack.org/wiki/Ironic - -Developers wishing to contribute to an OpenStack project should -find plenty of helpful resources here: - - https://wiki.openstack.org/wiki/Getting_Started - -All OpenStack projects use Gerrit for code reviews. -A good reference for that is here: - - https://wiki.openstack.org/wiki/GerritWorkflow - --------------------- -Project Architecture --------------------- - -An Ironic deployment will be composed of the following components: - -- A **RESTful API** service, by which operators and other services may interact - with the managed bare metal servers. -- A **Manager** service, which does the bulk of the work. Functionality is - exposed via the API service. The Manager and API services communicate via - RPC. -- One or more **Deployment Agents**, which provide local control over the - hardware which is not available remotely to the Manager. A ramdisk should be - built which contains one of these agents, eg. with - https://github.com/stackforge/diskimage-builder, and this ramdisk can be - booted on-demand. The agent is never run inside a tenant instance. -- A **Database** and a DB API for storing persistent state of the Manager and - Drivers. - -The internal driver API provides a consistent interface between the -Manager service and the driver implementations. There are two types of drivers: - -- ControlDrivers manage the hardware, performing functions such as power - on/off, toggle boot device, etc. -- DeployDrivers handle the task of booting a temporary ramdisk, formatting - drives, and putting a persistent image onto the hardware. -- Driver implementations are loaded and instantiated via entrypoints when the - ManagerService starts. Each Node record stored in the database indicates - which drivers should manage it. When a task is started on that node, - information about the node and task is passed to the corresponding driver. - In this way, heterogeneous hardware deployments can be managed by a single - Manager service. - -In addition to the two types of drivers, there are three categories of driver -functionality: core, common, and vendor: - -- "Core" functionality represents the minimal API for that driver type, eg. - power on/off for a ControlDriver. -- "Common" functionality represents an extended but supported API, and any - driver which implements it must be consistent with all other driver - implementations of that functionality. For example, if a driver supports - enumerating PCI devices, it must return that list as well-structured JSON. In - this case, Ironic may validate the API input's structure, but will pass it - unaltered to the driver. This ensures compatibility for common features - across drivers. -- "Vendor" functionality allows an excemption to the API contract when a vendor - wishes to expose unique functionality provided by their hardware and is - unable to do so within the core or common APIs. In this case, Ironic will - neither store nor introspect the messages passed between the API and the - driver. +Tuskar is playground for some ideas for an OpenStack management API. +Send pull requests! ----------- Development ----------- -Ironic source code should be pulled directly from git:: +Tuskar source code should be pulled directly from git:: - git clone https://github.com/openstack/ironic + git clone https://github.com/openstack/tuskar Setting up a local environment for development can be done with tox:: - cd /ironic + cd /tuskar # install prerequisites * Ubuntu/Debian: @@ -122,4 +43,3 @@ Setting up a local environment for development can be done with tox:: # deactivate the virtualenv deactivate - diff --git a/etc/ironic/policy.json b/etc/tuskar/policy.json similarity index 100% rename from etc/ironic/policy.json rename to etc/tuskar/policy.json diff --git a/openstack-common.conf b/openstack-common.conf index 24cf5d91..dfb1e7f9 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -32,4 +32,4 @@ module=uuidutils module=version # The base module to hold the copy of openstack.common -base=ironic +base=tuskar diff --git a/requirements.txt b/requirements.txt index 755156af..e5fa22eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,17 +10,10 @@ lxml>=2.3 WebOb==1.2.3 greenlet>=0.3.1 sqlalchemy-migrate>=0.7.2 -netaddr>=0.7.6 -suds>=0.4 -paramiko Babel>=0.9.6 iso8601>=0.1.4 setuptools_git>=0.4 -python-quantumclient>=2.2.0,<3.0.0 -python-glanceclient>=0.5.0,<2 python-keystoneclient>=0.2.0 -stevedore>=0.7 -websockify<0.4 oslo.config>=1.1.0 Flask==0.9 pecan>=0.2.0 diff --git a/setup.cfg b/setup.cfg index f2440986..2269f666 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] -name = ironic +name = tuskar version = 2013.2 -summary = OpenStack Bare Metal Provisioning +summary = An OpenStack Management Service description-file = README.rst -author = OpenStack -author-email = openstack-dev@lists.openstack.org -home-page = http://www.openstack.org/ +author = Mark McLoughlin +author-email = markmc@redhat.com +home-page = https://github.com/markmc/tuskar classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -24,22 +24,13 @@ setup-hooks = [files] packages = - ironic + tuskar [entry_points] console_scripts = - ironic-api = ironic.cmd.api:main - ironic-dbsync = ironic.cmd.dbsync:main - ironic-manager = ironic.cmd.manager:main - -ironic.controllers = - fake = ironic.drivers.fake:FakeControlDriver - ipmi = ironic.drivers.ipmi:IPMIPowerDriver -# vpd = ironic.drivers.vpd:VirtualPowerDriver - -ironic.deployers = - fake = ironic.drivers.fake:FakeDeployDriver -# pxe = ironic.drivers.pxe.PXEDeployDriver + tuskar-api = tuskar.cmd.api:main + tuskar-dbsync = tuskar.cmd.dbsync:main + tuskar-manager = tuskar.cmd.manager:main [build_sphinx] all_files = 1 @@ -52,15 +43,15 @@ tag_date = 0 tag_svn_revision = 0 [compile_catalog] -directory = ironic/locale -domain = ironic +directory = tuskar/locale +domain = tuskar [update_catalog] -domain = ironic -output_dir = ironic/locale -input_file = ironic/locale/ironic.pot +domain = tuskar +output_dir = tuskar/locale +input_file = tuskar/locale/tuskar.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = ironic/locale/ironic.pot +output_file = tuskar/locale/tuskar.pot diff --git a/setup.py b/setup.py index bad41c20..5f6c0f61 100644 --- a/setup.py +++ b/setup.py @@ -16,14 +16,14 @@ import setuptools -from ironic.openstack.common import setup as common_setup +from tuskar.openstack.common import setup as common_setup -project = 'ironic' +project = 'tuskar' setuptools.setup( name=project, version=common_setup.get_version(project, '2013.1'), - description='Bare Metal controller', + description='An OpenStack Management Service', classifiers=[ 'Environment :: OpenStack', 'Intended Audience :: Information Technology', diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py index d9195838..69c1a586 100644 --- a/tools/patch_tox_venv.py +++ b/tools/patch_tox_venv.py @@ -40,7 +40,7 @@ def main(argv): os.path.join(root, 'tools', 'test-requires'), ]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'ironic' + project = 'tuskar' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, py_version, project) #NOTE(dprince): For Tox we only run post_process (which patches files, etc) diff --git a/tox.ini b/tox.ini index 7866cc0b..ccb26123 100644 --- a/tox.ini +++ b/tox.ini @@ -31,4 +31,4 @@ commands = {posargs} [flake8] ignore = E12 builtins = _ -exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*ironic/nova*,*ironic/tests/nova*,tools +exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools diff --git a/ironic/__init__.py b/tuskar/__init__.py similarity index 100% rename from ironic/__init__.py rename to tuskar/__init__.py diff --git a/ironic/api/__init__.py b/tuskar/api/__init__.py similarity index 79% rename from ironic/api/__init__.py rename to tuskar/api/__init__.py index 1d6743d2..9a6970cc 100644 --- a/ironic/api/__init__.py +++ b/tuskar/api/__init__.py @@ -18,18 +18,18 @@ import flask.helpers from oslo.config import cfg -from ironic.openstack.common import jsonutils +from tuskar.openstack.common import jsonutils flask.helpers.json = jsonutils API_SERVICE_OPTS = [ - cfg.StrOpt('ironic_api_bind_ip', + cfg.StrOpt('tuskar_api_bind_ip', default='0.0.0.0', - help='IP for the Ironic API server to bind to', + help='IP for the Tuskar API server to bind to', ), - cfg.IntOpt('ironic_api_port', + cfg.IntOpt('tuskar_api_port', default=6385, - help='The port for the Ironic API server', + help='The port for the Tuskar API server', ), ] diff --git a/ironic/api/acl.py b/tuskar/api/acl.py similarity index 97% rename from ironic/api/acl.py rename to tuskar/api/acl.py index eab697e6..33001d10 100644 --- a/ironic/api/acl.py +++ b/tuskar/api/acl.py @@ -23,7 +23,7 @@ from oslo.config import cfg from pecan import hooks from webob import exc -from ironic.common import policy +from tuskar.common import policy OPT_GROUP_NAME = 'keystone_authtoken' diff --git a/ironic/api/app.py b/tuskar/api/app.py similarity index 96% rename from ironic/api/app.py rename to tuskar/api/app.py index b3e62371..03faa22d 100644 --- a/ironic/api/app.py +++ b/tuskar/api/app.py @@ -19,9 +19,9 @@ from oslo.config import cfg import pecan -from ironic.api import acl -from ironic.api import config -from ironic.api import hooks +from tuskar.api import acl +from tuskar.api import config +from tuskar.api import hooks auth_opts = [ cfg.StrOpt('auth_strategy', diff --git a/ironic/api/config.py b/tuskar/api/config.py similarity index 71% rename from ironic/api/config.py rename to tuskar/api/config.py index cf93dd1a..750e26cd 100644 --- a/ironic/api/config.py +++ b/tuskar/api/config.py @@ -6,10 +6,10 @@ server = { # Pecan Application Configurations app = { - 'root': 'ironic.api.controllers.root.RootController', - 'modules': ['ironic.api'], + 'root': 'tuskar.api.controllers.root.RootController', + 'modules': ['tuskar.api'], 'static_root': '%(confdir)s/public', - 'template_path': '%(confdir)s/ironic/api/templates', + 'template_path': '%(confdir)s/tuskar/api/templates', 'debug': False, 'enable_acl': False, } diff --git a/ironic/api/controllers/__init__.py b/tuskar/api/controllers/__init__.py similarity index 100% rename from ironic/api/controllers/__init__.py rename to tuskar/api/controllers/__init__.py diff --git a/ironic/api/controllers/root.py b/tuskar/api/controllers/root.py similarity index 95% rename from ironic/api/controllers/root.py rename to tuskar/api/controllers/root.py index 8df1f4fa..6b0f1144 100644 --- a/ironic/api/controllers/root.py +++ b/tuskar/api/controllers/root.py @@ -18,7 +18,7 @@ import pecan -from ironic.api.controllers import v1 +from tuskar.api.controllers import v1 class RootController(object): diff --git a/ironic/api/controllers/v1.py b/tuskar/api/controllers/v1.py similarity index 95% rename from ironic/api/controllers/v1.py rename to tuskar/api/controllers/v1.py index 31298462..a96619b1 100644 --- a/ironic/api/controllers/v1.py +++ b/tuskar/api/controllers/v1.py @@ -16,10 +16,7 @@ # under the License. """ -Version 1 of the Ironic API - -Should maintain feature parity with Nova Baremetal Extension. -Specification in ironic/doc/api/v1.rst +Version 1 of the Tuskar API """ import pecan @@ -29,7 +26,7 @@ import wsme from wsme import types as wtypes import wsmeext.pecan as wsme_pecan -from ironic.openstack.common import log +from tuskar.openstack.common import log LOG = log.getLogger(__name__) diff --git a/ironic/api/hooks.py b/tuskar/api/hooks.py similarity index 96% rename from ironic/api/hooks.py rename to tuskar/api/hooks.py index b26cea34..151a0022 100644 --- a/ironic/api/hooks.py +++ b/tuskar/api/hooks.py @@ -19,7 +19,7 @@ from oslo.config import cfg from pecan import hooks -from ironic.db import api as dbapi +from tuskar.db import api as dbapi class ConfigHook(hooks.PecanHook): diff --git a/ironic/api/model/__init__.py b/tuskar/api/model/__init__.py similarity index 100% rename from ironic/api/model/__init__.py rename to tuskar/api/model/__init__.py diff --git a/ironic/api/templates/index.html b/tuskar/api/templates/index.html similarity index 84% rename from ironic/api/templates/index.html rename to tuskar/api/templates/index.html index 48a5dae5..a18a7b02 100644 --- a/ironic/api/templates/index.html +++ b/tuskar/api/templates/index.html @@ -1,5 +1,5 @@ <%def name="title()"> - Ironic API v1 + Tuskar API v1
diff --git a/ironic/cmd/__init__.py b/tuskar/cmd/__init__.py similarity index 83% rename from ironic/cmd/__init__.py rename to tuskar/cmd/__init__.py index 895c2440..d2434949 100644 --- a/ironic/cmd/__init__.py +++ b/tuskar/cmd/__init__.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -# TODO(deva): move eventlet imports to ironic.__init__ once we move to PBR +# TODO(deva): move eventlet imports to tuskar.__init__ once we move to PBR import os os.environ['EVENTLET_NO_GREENDNS'] = 'yes' @@ -22,5 +22,5 @@ import eventlet eventlet.monkey_patch(os=False) -from ironic.openstack.common import gettextutils -gettextutils.install('ironic') +from tuskar.openstack.common import gettextutils +gettextutils.install('tuskar') diff --git a/ironic/cmd/api.py b/tuskar/cmd/api.py similarity index 83% rename from ironic/cmd/api.py rename to tuskar/cmd/api.py index 55511ea3..7aab942e 100644 --- a/ironic/cmd/api.py +++ b/tuskar/cmd/api.py @@ -18,7 +18,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""The Ironic Service API.""" +"""The Tuskar Service API.""" import logging import sys @@ -26,20 +26,20 @@ import sys from oslo.config import cfg from wsgiref import simple_server -from ironic.api import app -from ironic.common import service as ironic_service -from ironic.openstack.common import log +from tuskar.api import app +from tuskar.common import service as tuskar_service +from tuskar.openstack.common import log CONF = cfg.CONF def main(): # Pase config file and command line options, then start logging - ironic_service.prepare_service(sys.argv) + tuskar_service.prepare_service(sys.argv) # Build and start the WSGI app - host = CONF.ironic_api_bind_ip - port = CONF.ironic_api_port + host = CONF.tuskar_api_bind_ip + port = CONF.tuskar_api_port wsgi = simple_server.make_server( host, port, app.VersionSelectorApplication()) diff --git a/ironic/cmd/dbsync.py b/tuskar/cmd/dbsync.py similarity index 93% rename from ironic/cmd/dbsync.py rename to tuskar/cmd/dbsync.py index 7a923129..b51d844f 100644 --- a/ironic/cmd/dbsync.py +++ b/tuskar/cmd/dbsync.py @@ -24,8 +24,8 @@ Run storage database migration. import sys -from ironic.common import service -from ironic.db import migration +from tuskar.common import service +from tuskar.db import migration def main(): diff --git a/ironic/cmd/manager.py b/tuskar/cmd/manager.py similarity index 81% rename from ironic/cmd/manager.py rename to tuskar/cmd/manager.py index ddbeee62..8c52da89 100644 --- a/ironic/cmd/manager.py +++ b/tuskar/cmd/manager.py @@ -19,26 +19,26 @@ # under the License. """ -The Ironic Management Service +The Tuskar Management Service """ import sys from oslo.config import cfg -from ironic.openstack.common import service +from tuskar.openstack.common import service -from ironic.common import service as ironic_service -from ironic.manager import manager +from tuskar.common import service as tuskar_service +from tuskar.manager import manager CONF = cfg.CONF def main(): # Pase config file and command line options, then start logging - ironic_service.prepare_service(sys.argv) + tuskar_service.prepare_service(sys.argv) - topic = 'ironic.manager' + topic = 'tuskar.manager' mgr = manager.ManagerService(CONF.host, topic) launcher = service.launch(mgr) launcher.wait() diff --git a/ironic/common/__init__.py b/tuskar/common/__init__.py similarity index 100% rename from ironic/common/__init__.py rename to tuskar/common/__init__.py diff --git a/ironic/common/config.py b/tuskar/common/config.py similarity index 79% rename from ironic/common/config.py rename to tuskar/common/config.py index ba6d268f..eab22ca8 100644 --- a/ironic/common/config.py +++ b/tuskar/common/config.py @@ -19,19 +19,19 @@ from oslo.config import cfg -from ironic.common import paths -from ironic.openstack.common.db.sqlalchemy import session as db_session -from ironic.openstack.common import rpc -from ironic import version +from tuskar.common import paths +from tuskar.openstack.common.db.sqlalchemy import session as db_session +from tuskar.openstack.common import rpc +from tuskar import version _DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('$sqlite_db') def parse_args(argv, default_config_files=None): db_session.set_defaults(sql_connection=_DEFAULT_SQL_CONNECTION, - sqlite_db='ironic.sqlite') - rpc.set_defaults(control_exchange='ironic') + sqlite_db='tuskar.sqlite') + rpc.set_defaults(control_exchange='tuskar') cfg.CONF(argv[1:], - project='ironic', + project='tuskar', version=version.version_string(), default_config_files=default_config_files) diff --git a/ironic/common/context.py b/tuskar/common/context.py similarity index 97% rename from ironic/common/context.py rename to tuskar/common/context.py index c393079d..6722e1dc 100644 --- a/ironic/common/context.py +++ b/tuskar/common/context.py @@ -22,11 +22,11 @@ import copy import uuid -from ironic.common import exception -from ironic.common import policy -from ironic.openstack.common import local -from ironic.openstack.common import log as logging -from ironic.openstack.common import timeutils +from tuskar.common import exception +from tuskar.common import policy +from tuskar.openstack.common import local +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/ironic/common/exception.py b/tuskar/common/exception.py similarity index 93% rename from ironic/common/exception.py rename to tuskar/common/exception.py index a5301060..6e9510a4 100644 --- a/ironic/common/exception.py +++ b/tuskar/common/exception.py @@ -16,9 +16,9 @@ # License for the specific language governing permissions and limitations # under the License. -"""Ironic base exception handling. +"""Tuskar base exception handling. -Includes decorator for re-raising Ironic-type exceptions. +Includes decorator for re-raising Tuskar-type exceptions. SHOULD include dedicated exception logging. @@ -28,9 +28,9 @@ import functools from oslo.config import cfg -from ironic.common import safe_utils -from ironic.openstack.common import excutils -from ironic.openstack.common import log as logging +from tuskar.common import safe_utils +from tuskar.openstack.common import excutils +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -108,8 +108,8 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None, return inner -class IronicException(Exception): - """Base Ironic Exception +class TuskarException(Exception): + """Base Tuskar Exception To correctly use this class, inherit from it and define a 'message' property. That message will get printf'd @@ -147,7 +147,7 @@ class IronicException(Exception): # at least get the core message out if something happened message = self.message - super(IronicException, self).__init__(message) + super(TuskarException, self).__init__(message) def format_message(self): if self.__class__.__name__.endswith('_Remote'): @@ -156,7 +156,7 @@ class IronicException(Exception): return unicode(self) -class NotAuthorized(IronicException): +class NotAuthorized(TuskarException): message = _("Not authorized.") code = 403 @@ -169,7 +169,7 @@ class PolicyNotAuthorized(NotAuthorized): message = _("Policy doesn't allow %(action)s to be performed.") -class Invalid(IronicException): +class Invalid(TuskarException): message = _("Unacceptable parameters.") code = 400 @@ -200,7 +200,7 @@ class InvalidParameterValue(Invalid): message = _("%(err)s") -class NotFound(IronicException): +class NotFound(TuskarException): message = _("Resource could not be found.") code = 404 @@ -245,7 +245,7 @@ class PortNotFound(NotFound): message = _("Port %(port)s could not be found.") -class PowerStateFailure(IronicException): +class PowerStateFailure(TuskarException): message = _("Failed to set node power state to %(pstate)s.") @@ -254,5 +254,5 @@ class ExclusiveLockRequired(NotAuthorized): "but the current context has a shared lock.") -class IPMIFailure(IronicException): +class IPMIFailure(TuskarException): message = _("IPMI command failed: %(cmd)s.") diff --git a/ironic/common/paths.py b/tuskar/common/paths.py similarity index 100% rename from ironic/common/paths.py rename to tuskar/common/paths.py diff --git a/ironic/common/policy.py b/tuskar/common/policy.py similarity index 95% rename from ironic/common/policy.py rename to tuskar/common/policy.py index a99aaf3f..5b2bf82a 100644 --- a/ironic/common/policy.py +++ b/tuskar/common/policy.py @@ -15,15 +15,15 @@ # License for the specific language governing permissions and limitations # under the License. -"""Policy Engine For Ironic.""" +"""Policy Engine For Tuskar.""" import os.path from oslo.config import cfg -from ironic.common import exception -from ironic.common import utils -from ironic.openstack.common import policy +from tuskar.common import exception +from tuskar.common import utils +from tuskar.openstack.common import policy policy_opts = [ @@ -71,7 +71,7 @@ def _set_rules(data): def enforce(context, action, target, do_raise=True): """Verifies that the action is valid on the target in this context. - :param context: ironic context + :param context: tuskar context :param action: string representing the action to be checked this should be colon separated for clarity. i.e. ``compute:create_instance``, diff --git a/ironic/common/safe_utils.py b/tuskar/common/safe_utils.py similarity index 100% rename from ironic/common/safe_utils.py rename to tuskar/common/safe_utils.py diff --git a/ironic/common/service.py b/tuskar/common/service.py similarity index 87% rename from ironic/common/service.py rename to tuskar/common/service.py index d11d38a8..b96aad4f 100644 --- a/ironic/common/service.py +++ b/tuskar/common/service.py @@ -21,10 +21,10 @@ import socket from oslo.config import cfg -from ironic.openstack.common import context -from ironic.openstack.common import log -from ironic.openstack.common import rpc -from ironic.openstack.common.rpc import service as rpc_service +from tuskar.openstack.common import context +from tuskar.openstack.common import log +from tuskar.openstack.common import rpc +from tuskar.openstack.common.rpc import service as rpc_service cfg.CONF.register_opts([ @@ -52,7 +52,7 @@ class PeriodicService(rpc_service.Service): def prepare_service(argv=[]): - rpc.set_defaults(control_exchange='ironic') + rpc.set_defaults(control_exchange='tuskar') cfg.set_defaults(log.log_opts, default_log_levels=['amqplib=WARN', 'qpid.messaging=INFO', @@ -61,5 +61,5 @@ def prepare_service(argv=[]): 'stevedore=INFO', 'eventlet.wsgi.server=WARN' ]) - cfg.CONF(argv[1:], project='ironic') - log.setup('ironic') + cfg.CONF(argv[1:], project='tuskar') + log.setup('tuskar') diff --git a/ironic/common/utils.py b/tuskar/common/utils.py similarity index 95% rename from ironic/common/utils.py rename to tuskar/common/utils.py index 752f3487..d8aae18c 100644 --- a/ironic/common/utils.py +++ b/tuskar/common/utils.py @@ -24,8 +24,8 @@ import os from oslo.config import cfg -from ironic.common import exception -from ironic.openstack.common import log as logging +from tuskar.common import exception +from tuskar.openstack.common import log as logging CONF = cfg.CONF LOG = logging.getLogger(__name__) @@ -48,7 +48,7 @@ class LazyPluggable(object): backend_name = CONF[self.__config_group][self.__pivot] if backend_name not in self.__backends: msg = _('Invalid backend: %s') % backend_name - raise exception.IronicException(msg) + raise exception.TuskarException(msg) backend = self.__backends[backend_name] if isinstance(backend, tuple): diff --git a/ironic/db/__init__.py b/tuskar/db/__init__.py similarity index 100% rename from ironic/db/__init__.py rename to tuskar/db/__init__.py diff --git a/ironic/db/api.py b/tuskar/db/api.py similarity index 95% rename from ironic/db/api.py rename to tuskar/db/api.py index 8534b160..33774d1b 100644 --- a/ironic/db/api.py +++ b/tuskar/db/api.py @@ -20,9 +20,9 @@ Base classes for storage engines import abc -from ironic.openstack.common.db import api as db_api +from tuskar.openstack.common.db import api as db_api -_BACKEND_MAPPING = {'sqlalchemy': 'ironic.db.sqlalchemy.api'} +_BACKEND_MAPPING = {'sqlalchemy': 'tuskar.db.sqlalchemy.api'} IMPL = db_api.DBAPI(backend_mapping=_BACKEND_MAPPING) diff --git a/ironic/db/migration.py b/tuskar/db/migration.py similarity index 90% rename from ironic/db/migration.py rename to tuskar/db/migration.py index 0f8d2b53..fe00e837 100644 --- a/ironic/db/migration.py +++ b/tuskar/db/migration.py @@ -20,17 +20,17 @@ from oslo.config import cfg -from ironic.common import utils +from tuskar.common import utils CONF = cfg.CONF CONF.import_opt('backend', - 'ironic.openstack.common.db.api', + 'tuskar.openstack.common.db.api', group='database') IMPL = utils.LazyPluggable( pivot='backend', config_group='database', - sqlalchemy='ironic.db.sqlalchemy.migration') + sqlalchemy='tuskar.db.sqlalchemy.migration') INIT_VERSION = 0 diff --git a/ironic/db/sqlalchemy/__init__.py b/tuskar/db/sqlalchemy/__init__.py similarity index 100% rename from ironic/db/sqlalchemy/__init__.py rename to tuskar/db/sqlalchemy/__init__.py diff --git a/ironic/db/sqlalchemy/api.py b/tuskar/db/sqlalchemy/api.py similarity index 91% rename from ironic/db/sqlalchemy/api.py rename to tuskar/db/sqlalchemy/api.py index 40c3f4a4..de62f0b4 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/tuskar/db/sqlalchemy/api.py @@ -22,17 +22,17 @@ from oslo.config import cfg # TODO(deva): import MultipleResultsFound and handle it appropriately from sqlalchemy.orm.exc import NoResultFound -from ironic.common import exception -from ironic.common import utils -from ironic.db import api -from ironic.db.sqlalchemy import models -from ironic.openstack.common.db.sqlalchemy import session as db_session -from ironic.openstack.common import log -from ironic.openstack.common import uuidutils +from tuskar.common import exception +from tuskar.common import utils +from tuskar.db import api +from tuskar.db.sqlalchemy import models +from tuskar.openstack.common.db.sqlalchemy import session as db_session +from tuskar.openstack.common import log +from tuskar.openstack.common import uuidutils CONF = cfg.CONF CONF.import_opt('connection', - 'ironic.openstack.common.db.sqlalchemy.session', + 'tuskar.openstack.common.db.sqlalchemy.session', group='database') LOG = log.getLogger(__name__) diff --git a/ironic/db/sqlalchemy/migrate_repo/__init__.py b/tuskar/db/sqlalchemy/migrate_repo/__init__.py similarity index 100% rename from ironic/db/sqlalchemy/migrate_repo/__init__.py rename to tuskar/db/sqlalchemy/migrate_repo/__init__.py diff --git a/ironic/db/sqlalchemy/migrate_repo/manage.py b/tuskar/db/sqlalchemy/migrate_repo/manage.py similarity index 100% rename from ironic/db/sqlalchemy/migrate_repo/manage.py rename to tuskar/db/sqlalchemy/migrate_repo/manage.py diff --git a/ironic/db/sqlalchemy/migrate_repo/migrate.cfg b/tuskar/db/sqlalchemy/migrate_repo/migrate.cfg similarity index 97% rename from ironic/db/sqlalchemy/migrate_repo/migrate.cfg rename to tuskar/db/sqlalchemy/migrate_repo/migrate.cfg index bf840196..f54a8de1 100644 --- a/ironic/db/sqlalchemy/migrate_repo/migrate.cfg +++ b/tuskar/db/sqlalchemy/migrate_repo/migrate.cfg @@ -1,7 +1,7 @@ [db_settings] # Used to identify which repository this database is versioned under. # You can use the name of your project. -repository_id=ironic +repository_id=tuskar # The name of the database table used to track the schema version. # This name shouldn't already be used by your project. diff --git a/ironic/db/sqlalchemy/migrate_repo/versions/001_init.py b/tuskar/db/sqlalchemy/migrate_repo/versions/001_init.py similarity index 98% rename from ironic/db/sqlalchemy/migrate_repo/versions/001_init.py rename to tuskar/db/sqlalchemy/migrate_repo/versions/001_init.py index 33440e57..4bc202a5 100644 --- a/ironic/db/sqlalchemy/migrate_repo/versions/001_init.py +++ b/tuskar/db/sqlalchemy/migrate_repo/versions/001_init.py @@ -20,7 +20,7 @@ from migrate.changeset import UniqueConstraint from sqlalchemy import Table, Column, ForeignKey, MetaData from sqlalchemy import DateTime, Integer, String, Text -from ironic.openstack.common import log as logging +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/db/sqlalchemy/migrate_repo/versions/__init__.py b/tuskar/db/sqlalchemy/migrate_repo/versions/__init__.py similarity index 100% rename from ironic/db/sqlalchemy/migrate_repo/versions/__init__.py rename to tuskar/db/sqlalchemy/migrate_repo/versions/__init__.py diff --git a/ironic/db/sqlalchemy/migration.py b/tuskar/db/sqlalchemy/migration.py similarity index 93% rename from ironic/db/sqlalchemy/migration.py rename to tuskar/db/sqlalchemy/migration.py index ae026158..125a6ff5 100644 --- a/ironic/db/sqlalchemy/migration.py +++ b/tuskar/db/sqlalchemy/migration.py @@ -23,9 +23,9 @@ import migrate from migrate.versioning import util as migrate_util import sqlalchemy -from ironic.common import exception -from ironic.db import migration -from ironic.openstack.common.db.sqlalchemy import session as db_session +from tuskar.common import exception +from tuskar.db import migration +from tuskar.openstack.common.db.sqlalchemy import session as db_session @migrate_util.decorator @@ -65,7 +65,7 @@ def db_sync(version=None): try: version = int(version) except ValueError: - raise exception.IronicException(_("version should be an integer")) + raise exception.TuskarException(_("version should be an integer")) current_version = db_version() repository = _find_migrate_repo() @@ -91,7 +91,7 @@ def db_version(): else: # Some pre-Essex DB's may not be version controlled. # Require them to upgrade using Essex first. - raise exception.IronicException( + raise exception.TuskarException( _("Upgrade DB using Essex release first.")) diff --git a/ironic/db/sqlalchemy/models.py b/tuskar/db/sqlalchemy/models.py similarity index 94% rename from ironic/db/sqlalchemy/models.py rename to tuskar/db/sqlalchemy/models.py index ba034a19..d8e7d525 100644 --- a/ironic/db/sqlalchemy/models.py +++ b/tuskar/db/sqlalchemy/models.py @@ -29,7 +29,7 @@ from sqlalchemy import Integer, String, Text from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.types import TypeDecorator, VARCHAR -from ironic.openstack.common.db.sqlalchemy import models +from tuskar.openstack.common.db.sqlalchemy import models sql_opts = [ cfg.StrOpt('mysql_engine', @@ -64,7 +64,7 @@ class JSONEncodedDict(TypeDecorator): return value -class IronicBase(models.TimestampMixin, +class TuskarBase(models.TimestampMixin, models.ModelBase): metadata = None @@ -76,7 +76,7 @@ class IronicBase(models.TimestampMixin, return d -Base = declarative_base(cls=IronicBase) +Base = declarative_base(cls=TuskarBase) class Blaa(Base): diff --git a/ironic/drivers/__init__.py b/tuskar/drivers/__init__.py similarity index 100% rename from ironic/drivers/__init__.py rename to tuskar/drivers/__init__.py diff --git a/ironic/manager/__init__.py b/tuskar/manager/__init__.py similarity index 100% rename from ironic/manager/__init__.py rename to tuskar/manager/__init__.py diff --git a/ironic/manager/manager.py b/tuskar/manager/manager.py similarity index 73% rename from ironic/manager/manager.py rename to tuskar/manager/manager.py index 835d5a39..96aab401 100644 --- a/ironic/manager/manager.py +++ b/tuskar/manager/manager.py @@ -16,22 +16,17 @@ # License for the specific language governing permissions and limitations # under the License. -from ironic.common import service -from ironic.openstack.common import log +from tuskar.common import service +from tuskar.openstack.common import log LOG = log.getLogger(__name__) class ManagerService(service.PeriodicService): - """Ironic Manager Service. + """Tuskar Manager Service. - A single instance of this class is created within the ironic-manager - process. It is responsible for performing all actions on Chassis, Nodes, - and Ports, and tracks these actions via Trackers. - - Tracker instances are created on-demand and destroyed when the - operation(s) are complete. Persistent state is stored in a database, - which is also used to coordinate locks between ManagerServices. + A single instance of this class is created within the tuskar-manager + process. """ def __init__(self, host, topic): diff --git a/ironic/netconf.py b/tuskar/netconf.py similarity index 100% rename from ironic/netconf.py rename to tuskar/netconf.py diff --git a/ironic/openstack/__init__.py b/tuskar/openstack/__init__.py similarity index 100% rename from ironic/openstack/__init__.py rename to tuskar/openstack/__init__.py diff --git a/ironic/openstack/common/__init__.py b/tuskar/openstack/common/__init__.py similarity index 100% rename from ironic/openstack/common/__init__.py rename to tuskar/openstack/common/__init__.py diff --git a/ironic/openstack/common/cliutils.py b/tuskar/openstack/common/cliutils.py similarity index 100% rename from ironic/openstack/common/cliutils.py rename to tuskar/openstack/common/cliutils.py diff --git a/ironic/openstack/common/context.py b/tuskar/openstack/common/context.py similarity index 98% rename from ironic/openstack/common/context.py rename to tuskar/openstack/common/context.py index 7172c1bc..43c945b3 100644 --- a/ironic/openstack/common/context.py +++ b/tuskar/openstack/common/context.py @@ -24,7 +24,7 @@ context or provide additional information in their specific WSGI pipeline. import itertools -from ironic.openstack.common import uuidutils +from tuskar.openstack.common import uuidutils def generate_request_id(): diff --git a/ironic/openstack/common/db/__init__.py b/tuskar/openstack/common/db/__init__.py similarity index 100% rename from ironic/openstack/common/db/__init__.py rename to tuskar/openstack/common/db/__init__.py diff --git a/ironic/openstack/common/db/api.py b/tuskar/openstack/common/db/api.py similarity index 96% rename from ironic/openstack/common/db/api.py rename to tuskar/openstack/common/db/api.py index 0c98cec6..d3ceebb1 100644 --- a/ironic/openstack/common/db/api.py +++ b/tuskar/openstack/common/db/api.py @@ -40,8 +40,8 @@ import functools from oslo.config import cfg -from ironic.openstack.common import importutils -from ironic.openstack.common import lockutils +from tuskar.openstack.common import importutils +from tuskar.openstack.common import lockutils db_opts = [ @@ -69,7 +69,7 @@ class DBAPI(object): self.__backend = None self.__backend_mapping = backend_mapping - @lockutils.synchronized('dbapi_backend', 'ironic-') + @lockutils.synchronized('dbapi_backend', 'tuskar-') def __get_backend(self): """Get the actual backend. May be a module or an instance of a class. Doesn't matter to us. We do this synchronized as it's diff --git a/ironic/openstack/common/db/exception.py b/tuskar/openstack/common/db/exception.py similarity index 96% rename from ironic/openstack/common/db/exception.py rename to tuskar/openstack/common/db/exception.py index 894eb2d3..c7cbdd98 100644 --- a/ironic/openstack/common/db/exception.py +++ b/tuskar/openstack/common/db/exception.py @@ -18,7 +18,7 @@ """DB related custom exceptions.""" -from ironic.openstack.common.gettextutils import _ +from tuskar.openstack.common.gettextutils import _ class DBError(Exception): diff --git a/ironic/openstack/common/db/sqlalchemy/__init__.py b/tuskar/openstack/common/db/sqlalchemy/__init__.py similarity index 100% rename from ironic/openstack/common/db/sqlalchemy/__init__.py rename to tuskar/openstack/common/db/sqlalchemy/__init__.py diff --git a/ironic/openstack/common/db/sqlalchemy/models.py b/tuskar/openstack/common/db/sqlalchemy/models.py similarity index 97% rename from ironic/openstack/common/db/sqlalchemy/models.py rename to tuskar/openstack/common/db/sqlalchemy/models.py index e90d4110..015b8b05 100644 --- a/ironic/openstack/common/db/sqlalchemy/models.py +++ b/tuskar/openstack/common/db/sqlalchemy/models.py @@ -26,8 +26,8 @@ from sqlalchemy import Column, Integer from sqlalchemy import DateTime from sqlalchemy.orm import object_mapper -from ironic.openstack.common.db.sqlalchemy.session import get_session -from ironic.openstack.common import timeutils +from tuskar.openstack.common.db.sqlalchemy.session import get_session +from tuskar.openstack.common import timeutils class ModelBase(object): diff --git a/ironic/openstack/common/db/sqlalchemy/session.py b/tuskar/openstack/common/db/sqlalchemy/session.py similarity index 98% rename from ironic/openstack/common/db/sqlalchemy/session.py rename to tuskar/openstack/common/db/sqlalchemy/session.py index 3e06c546..671924b2 100644 --- a/ironic/openstack/common/db/sqlalchemy/session.py +++ b/tuskar/openstack/common/db/sqlalchemy/session.py @@ -26,8 +26,8 @@ Initializing: Example: session.set_defaults( - sql_connection="sqlite:///var/lib/ironic/sqlite.db", - sqlite_db="/var/lib/ironic/sqlite.db") + sql_connection="sqlite:///var/lib/tuskar/sqlite.db", + sqlite_db="/var/lib/tuskar/sqlite.db") Recommended ways to use sessions within this framework: @@ -255,16 +255,16 @@ import sqlalchemy.orm from sqlalchemy.pool import NullPool, StaticPool from sqlalchemy.sql.expression import literal_column -from ironic.openstack.common.db import exception -from ironic.openstack.common import log as logging -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import timeutils +from tuskar.openstack.common.db import exception +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import timeutils DEFAULT = 'DEFAULT' sqlite_db_opts = [ cfg.StrOpt('sqlite_db', - default='ironic.sqlite', + default='tuskar.sqlite', help='the filename to use with sqlite'), cfg.BoolOpt('sqlite_synchronous', default=True, @@ -679,8 +679,8 @@ def _patch_mysqldb_with_stacktrace_comments(): # db/api is just a wrapper around db/sqlalchemy/api if file.endswith('db/api.py'): continue - # only trace inside ironic - index = file.rfind('ironic') + # only trace inside tuskar + index = file.rfind('tuskar') if index == -1: continue stack += "File:%s:%s Method:%s() Line:%s | " \ diff --git a/ironic/openstack/common/db/sqlalchemy/utils.py b/tuskar/openstack/common/db/sqlalchemy/utils.py similarity index 97% rename from ironic/openstack/common/db/sqlalchemy/utils.py rename to tuskar/openstack/common/db/sqlalchemy/utils.py index 642f79b7..d1b12488 100644 --- a/ironic/openstack/common/db/sqlalchemy/utils.py +++ b/tuskar/openstack/common/db/sqlalchemy/utils.py @@ -22,8 +22,8 @@ import sqlalchemy -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/eventlet_backdoor.py b/tuskar/openstack/common/eventlet_backdoor.py similarity index 100% rename from ironic/openstack/common/eventlet_backdoor.py rename to tuskar/openstack/common/eventlet_backdoor.py diff --git a/ironic/openstack/common/excutils.py b/tuskar/openstack/common/excutils.py similarity index 97% rename from ironic/openstack/common/excutils.py rename to tuskar/openstack/common/excutils.py index ec55bae5..afb50465 100644 --- a/ironic/openstack/common/excutils.py +++ b/tuskar/openstack/common/excutils.py @@ -24,7 +24,7 @@ import logging import sys import traceback -from ironic.openstack.common.gettextutils import _ +from tuskar.openstack.common.gettextutils import _ @contextlib.contextmanager diff --git a/ironic/openstack/common/fileutils.py b/tuskar/openstack/common/fileutils.py similarity index 100% rename from ironic/openstack/common/fileutils.py rename to tuskar/openstack/common/fileutils.py diff --git a/ironic/openstack/common/gettextutils.py b/tuskar/openstack/common/gettextutils.py similarity index 88% rename from ironic/openstack/common/gettextutils.py rename to tuskar/openstack/common/gettextutils.py index 69e336e5..837e9584 100644 --- a/ironic/openstack/common/gettextutils.py +++ b/tuskar/openstack/common/gettextutils.py @@ -20,14 +20,14 @@ gettext for openstack-common modules. Usual usage in an openstack.common module: - from ironic.openstack.common.gettextutils import _ + from tuskar.openstack.common.gettextutils import _ """ import gettext import os -_localedir = os.environ.get('ironic'.upper() + '_LOCALEDIR') -_t = gettext.translation('ironic', localedir=_localedir, fallback=True) +_localedir = os.environ.get('tuskar'.upper() + '_LOCALEDIR') +_t = gettext.translation('tuskar', localedir=_localedir, fallback=True) def _(msg): diff --git a/ironic/openstack/common/importutils.py b/tuskar/openstack/common/importutils.py similarity index 100% rename from ironic/openstack/common/importutils.py rename to tuskar/openstack/common/importutils.py diff --git a/ironic/openstack/common/jsonutils.py b/tuskar/openstack/common/jsonutils.py similarity index 99% rename from ironic/openstack/common/jsonutils.py rename to tuskar/openstack/common/jsonutils.py index 6848d061..a74cc583 100644 --- a/ironic/openstack/common/jsonutils.py +++ b/tuskar/openstack/common/jsonutils.py @@ -43,7 +43,7 @@ import xmlrpclib import six -from ironic.openstack.common import timeutils +from tuskar.openstack.common import timeutils _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod, diff --git a/ironic/openstack/common/local.py b/tuskar/openstack/common/local.py similarity index 100% rename from ironic/openstack/common/local.py rename to tuskar/openstack/common/local.py diff --git a/ironic/openstack/common/lockutils.py b/tuskar/openstack/common/lockutils.py similarity index 98% rename from ironic/openstack/common/lockutils.py rename to tuskar/openstack/common/lockutils.py index 0706f69c..2c79c198 100644 --- a/ironic/openstack/common/lockutils.py +++ b/tuskar/openstack/common/lockutils.py @@ -27,10 +27,10 @@ import weakref from eventlet import semaphore from oslo.config import cfg -from ironic.openstack.common import fileutils -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import local -from ironic.openstack.common import log as logging +from tuskar.openstack.common import fileutils +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import local +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/log.py b/tuskar/openstack/common/log.py similarity index 98% rename from ironic/openstack/common/log.py rename to tuskar/openstack/common/log.py index 5f304c77..b29d5b6c 100644 --- a/ironic/openstack/common/log.py +++ b/tuskar/openstack/common/log.py @@ -42,10 +42,10 @@ import traceback from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import jsonutils -from ironic.openstack.common import local +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import local _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -418,7 +418,7 @@ def _setup_logging_from_conf(): if CONF.publish_errors: handler = importutils.import_object( - "ironic.openstack.common.log_handler.PublishErrorsHandler", + "tuskar.openstack.common.log_handler.PublishErrorsHandler", logging.ERROR) log_root.addHandler(handler) diff --git a/ironic/openstack/common/log_handler.py b/tuskar/openstack/common/log_handler.py similarity index 90% rename from ironic/openstack/common/log_handler.py rename to tuskar/openstack/common/log_handler.py index fb284858..669a5043 100644 --- a/ironic/openstack/common/log_handler.py +++ b/tuskar/openstack/common/log_handler.py @@ -15,14 +15,14 @@ # under the License. import logging -from ironic.openstack.common import notifier +from tuskar.openstack.common import notifier from oslo.config import cfg class PublishErrorsHandler(logging.Handler): def emit(self, record): - if ('ironic.openstack.common.notifier.log_notifier' in + if ('tuskar.openstack.common.notifier.log_notifier' in cfg.CONF.notification_driver): return notifier.api.notify(None, 'error.publisher', diff --git a/ironic/openstack/common/loopingcall.py b/tuskar/openstack/common/loopingcall.py similarity index 96% rename from ironic/openstack/common/loopingcall.py rename to tuskar/openstack/common/loopingcall.py index 16c85301..48b9105c 100644 --- a/ironic/openstack/common/loopingcall.py +++ b/tuskar/openstack/common/loopingcall.py @@ -22,9 +22,9 @@ import sys from eventlet import event from eventlet import greenthread -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common import timeutils +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/network_utils.py b/tuskar/openstack/common/network_utils.py similarity index 97% rename from ironic/openstack/common/network_utils.py rename to tuskar/openstack/common/network_utils.py index a2785a97..55af7df1 100644 --- a/ironic/openstack/common/network_utils.py +++ b/tuskar/openstack/common/network_utils.py @@ -19,7 +19,7 @@ Network-related utilities and helper functions. """ -from ironic.openstack.common import log as logging +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/notifier/__init__.py b/tuskar/openstack/common/notifier/__init__.py similarity index 100% rename from ironic/openstack/common/notifier/__init__.py rename to tuskar/openstack/common/notifier/__init__.py diff --git a/ironic/openstack/common/notifier/api.py b/tuskar/openstack/common/notifier/api.py similarity index 95% rename from ironic/openstack/common/notifier/api.py rename to tuskar/openstack/common/notifier/api.py index 068da4d2..8efae50b 100644 --- a/ironic/openstack/common/notifier/api.py +++ b/tuskar/openstack/common/notifier/api.py @@ -17,12 +17,12 @@ import uuid from oslo.config import cfg -from ironic.openstack.common import context -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import jsonutils -from ironic.openstack.common import log as logging -from ironic.openstack.common import timeutils +from tuskar.openstack.common import context +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/notifier/log_notifier.py b/tuskar/openstack/common/notifier/log_notifier.py similarity index 88% rename from ironic/openstack/common/notifier/log_notifier.py rename to tuskar/openstack/common/notifier/log_notifier.py index 71a6717e..23c0a95c 100644 --- a/ironic/openstack/common/notifier/log_notifier.py +++ b/tuskar/openstack/common/notifier/log_notifier.py @@ -15,8 +15,8 @@ from oslo.config import cfg -from ironic.openstack.common import jsonutils -from ironic.openstack.common import log as logging +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import log as logging CONF = cfg.CONF @@ -30,6 +30,6 @@ def notify(_context, message): CONF.default_notification_level) priority = priority.lower() logger = logging.getLogger( - 'ironic.openstack.common.notification.%s' % + 'tuskar.openstack.common.notification.%s' % message['event_type']) getattr(logger, priority)(jsonutils.dumps(message)) diff --git a/ironic/openstack/common/notifier/no_op_notifier.py b/tuskar/openstack/common/notifier/no_op_notifier.py similarity index 100% rename from ironic/openstack/common/notifier/no_op_notifier.py rename to tuskar/openstack/common/notifier/no_op_notifier.py diff --git a/ironic/openstack/common/notifier/rpc_notifier.py b/tuskar/openstack/common/notifier/rpc_notifier.py similarity index 88% rename from ironic/openstack/common/notifier/rpc_notifier.py rename to tuskar/openstack/common/notifier/rpc_notifier.py index 845dec8b..917f09ba 100644 --- a/ironic/openstack/common/notifier/rpc_notifier.py +++ b/tuskar/openstack/common/notifier/rpc_notifier.py @@ -15,10 +15,10 @@ from oslo.config import cfg -from ironic.openstack.common import context as req_context -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common import rpc +from tuskar.openstack.common import context as req_context +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/notifier/rpc_notifier2.py b/tuskar/openstack/common/notifier/rpc_notifier2.py similarity index 89% rename from ironic/openstack/common/notifier/rpc_notifier2.py rename to tuskar/openstack/common/notifier/rpc_notifier2.py index 6bcc8ea8..1b3315d9 100644 --- a/ironic/openstack/common/notifier/rpc_notifier2.py +++ b/tuskar/openstack/common/notifier/rpc_notifier2.py @@ -17,10 +17,10 @@ from oslo.config import cfg -from ironic.openstack.common import context as req_context -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common import rpc +from tuskar.openstack.common import context as req_context +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/notifier/test_notifier.py b/tuskar/openstack/common/notifier/test_notifier.py similarity index 100% rename from ironic/openstack/common/notifier/test_notifier.py rename to tuskar/openstack/common/notifier/test_notifier.py diff --git a/ironic/openstack/common/periodic_task.py b/tuskar/openstack/common/periodic_task.py similarity index 97% rename from ironic/openstack/common/periodic_task.py rename to tuskar/openstack/common/periodic_task.py index f569e988..87a4b453 100644 --- a/ironic/openstack/common/periodic_task.py +++ b/tuskar/openstack/common/periodic_task.py @@ -18,9 +18,9 @@ import time from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common import timeutils +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import timeutils periodic_opts = [ diff --git a/ironic/openstack/common/plugin/__init__.py b/tuskar/openstack/common/plugin/__init__.py similarity index 100% rename from ironic/openstack/common/plugin/__init__.py rename to tuskar/openstack/common/plugin/__init__.py diff --git a/ironic/openstack/common/plugin/callbackplugin.py b/tuskar/openstack/common/plugin/callbackplugin.py similarity index 97% rename from ironic/openstack/common/plugin/callbackplugin.py rename to tuskar/openstack/common/plugin/callbackplugin.py index bbd4ba2e..f772c1a8 100644 --- a/ironic/openstack/common/plugin/callbackplugin.py +++ b/tuskar/openstack/common/plugin/callbackplugin.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from ironic.openstack.common import log as logging -from ironic.openstack.common.plugin import plugin +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.plugin import plugin LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/plugin/plugin.py b/tuskar/openstack/common/plugin/plugin.py similarity index 98% rename from ironic/openstack/common/plugin/plugin.py rename to tuskar/openstack/common/plugin/plugin.py index f539b37a..76e14c21 100644 --- a/ironic/openstack/common/plugin/plugin.py +++ b/tuskar/openstack/common/plugin/plugin.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from ironic.openstack.common import log as logging +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/plugin/pluginmanager.py b/tuskar/openstack/common/plugin/pluginmanager.py similarity index 94% rename from ironic/openstack/common/plugin/pluginmanager.py rename to tuskar/openstack/common/plugin/pluginmanager.py index 043b1ed7..917e3a51 100644 --- a/ironic/openstack/common/plugin/pluginmanager.py +++ b/tuskar/openstack/common/plugin/pluginmanager.py @@ -17,9 +17,9 @@ import pkg_resources from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common.notifier import api as notifier_api +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.notifier import api as notifier_api CONF = cfg.CONF diff --git a/ironic/openstack/common/policy.py b/tuskar/openstack/common/policy.py similarity index 99% rename from ironic/openstack/common/policy.py rename to tuskar/openstack/common/policy.py index 8463600c..51777fbe 100644 --- a/ironic/openstack/common/policy.py +++ b/tuskar/openstack/common/policy.py @@ -63,9 +63,9 @@ import urllib import six import urllib2 -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import jsonutils -from ironic.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/processutils.py b/tuskar/openstack/common/processutils.py similarity index 98% rename from ironic/openstack/common/processutils.py rename to tuskar/openstack/common/processutils.py index 2bc34d07..7537b8e4 100644 --- a/ironic/openstack/common/processutils.py +++ b/tuskar/openstack/common/processutils.py @@ -27,8 +27,8 @@ import signal from eventlet.green import subprocess from eventlet import greenthread -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/rootwrap/__init__.py b/tuskar/openstack/common/rootwrap/__init__.py similarity index 100% rename from ironic/openstack/common/rootwrap/__init__.py rename to tuskar/openstack/common/rootwrap/__init__.py diff --git a/ironic/openstack/common/rootwrap/cmd.py b/tuskar/openstack/common/rootwrap/cmd.py similarity index 90% rename from ironic/openstack/common/rootwrap/cmd.py rename to tuskar/openstack/common/rootwrap/cmd.py index 7078e741..b2e88be5 100755 --- a/ironic/openstack/common/rootwrap/cmd.py +++ b/tuskar/openstack/common/rootwrap/cmd.py @@ -20,14 +20,14 @@ Filters which commands a service is allowed to run as another user. - To use this with ironic, you should set the following in - ironic.conf: - rootwrap_config=/etc/ironic/rootwrap.conf + To use this with tuskar, you should set the following in + tuskar.conf: + rootwrap_config=/etc/tuskar/rootwrap.conf - You also need to let the ironic user run ironic-rootwrap + You also need to let the tuskar user run tuskar-rootwrap as root in sudoers: - ironic ALL = (root) NOPASSWD: /usr/bin/ironic-rootwrap - /etc/ironic/rootwrap.conf * + tuskar ALL = (root) NOPASSWD: /usr/bin/tuskar-rootwrap + /etc/tuskar/rootwrap.conf * Service packaging should deploy .filters files only on nodes where they are needed, to avoid allowing more than is necessary. @@ -75,10 +75,10 @@ def main(): # Add ../ to sys.path to allow running from branch possible_topdir = os.path.normpath(os.path.join(os.path.abspath(execname), os.pardir, os.pardir)) - if os.path.exists(os.path.join(possible_topdir, "ironic", "__init__.py")): + if os.path.exists(os.path.join(possible_topdir, "tuskar", "__init__.py")): sys.path.insert(0, possible_topdir) - from ironic.openstack.common.rootwrap import wrapper + from tuskar.openstack.common.rootwrap import wrapper # Load configuration try: diff --git a/ironic/openstack/common/rootwrap/filters.py b/tuskar/openstack/common/rootwrap/filters.py similarity index 100% rename from ironic/openstack/common/rootwrap/filters.py rename to tuskar/openstack/common/rootwrap/filters.py diff --git a/ironic/openstack/common/rootwrap/wrapper.py b/tuskar/openstack/common/rootwrap/wrapper.py similarity index 99% rename from ironic/openstack/common/rootwrap/wrapper.py rename to tuskar/openstack/common/rootwrap/wrapper.py index 1b631257..3c673661 100644 --- a/ironic/openstack/common/rootwrap/wrapper.py +++ b/tuskar/openstack/common/rootwrap/wrapper.py @@ -22,7 +22,7 @@ import logging.handlers import os import string -from ironic.openstack.common.rootwrap import filters +from tuskar.openstack.common.rootwrap import filters class NoFilterMatched(Exception): diff --git a/ironic/openstack/common/rpc/__init__.py b/tuskar/openstack/common/rpc/__init__.py similarity index 97% rename from ironic/openstack/common/rpc/__init__.py rename to tuskar/openstack/common/rpc/__init__.py index adea0a59..7b44121e 100644 --- a/ironic/openstack/common/rpc/__init__.py +++ b/tuskar/openstack/common/rpc/__init__.py @@ -29,10 +29,10 @@ import inspect from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import local -from ironic.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import local +from tuskar.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -56,7 +56,7 @@ rpc_opts = [ help='Seconds to wait before a cast expires (TTL). ' 'Only supported by impl_zmq.'), cfg.ListOpt('allowed_rpc_exception_modules', - default=['ironic.openstack.common.exception', + default=['tuskar.openstack.common.exception', 'nova.exception', 'cinder.exception', 'exceptions', diff --git a/ironic/openstack/common/rpc/amqp.py b/tuskar/openstack/common/rpc/amqp.py similarity index 99% rename from ironic/openstack/common/rpc/amqp.py rename to tuskar/openstack/common/rpc/amqp.py index 156e859a..251e6d45 100644 --- a/ironic/openstack/common/rpc/amqp.py +++ b/tuskar/openstack/common/rpc/amqp.py @@ -39,11 +39,11 @@ from eventlet import semaphore # option is removed. from oslo.config import cfg -from ironic.openstack.common import excutils -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import local -from ironic.openstack.common import log as logging -from ironic.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common import excutils +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import local +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.rpc import common as rpc_common # TODO(pekowski): Remove this option in Havana. diff --git a/ironic/openstack/common/rpc/common.py b/tuskar/openstack/common/rpc/common.py similarity index 98% rename from ironic/openstack/common/rpc/common.py rename to tuskar/openstack/common/rpc/common.py index 518bf068..2ac93e78 100644 --- a/ironic/openstack/common/rpc/common.py +++ b/tuskar/openstack/common/rpc/common.py @@ -24,11 +24,11 @@ import traceback from oslo.config import cfg import six -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import jsonutils -from ironic.openstack.common import local -from ironic.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import local +from tuskar.openstack.common import log as logging CONF = cfg.CONF diff --git a/ironic/openstack/common/rpc/dispatcher.py b/tuskar/openstack/common/rpc/dispatcher.py similarity index 98% rename from ironic/openstack/common/rpc/dispatcher.py rename to tuskar/openstack/common/rpc/dispatcher.py index 3f047e6e..a1b56e9a 100644 --- a/ironic/openstack/common/rpc/dispatcher.py +++ b/tuskar/openstack/common/rpc/dispatcher.py @@ -83,8 +83,8 @@ On the client side, the same changes should be made as in example 1. The minimum version that supports the new parameter should be specified. """ -from ironic.openstack.common.rpc import common as rpc_common -from ironic.openstack.common.rpc import serializer as rpc_serializer +from tuskar.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common.rpc import serializer as rpc_serializer class RpcDispatcher(object): diff --git a/ironic/openstack/common/rpc/impl_fake.py b/tuskar/openstack/common/rpc/impl_fake.py similarity index 98% rename from ironic/openstack/common/rpc/impl_fake.py rename to tuskar/openstack/common/rpc/impl_fake.py index 5d0e4bbd..e757c118 100644 --- a/ironic/openstack/common/rpc/impl_fake.py +++ b/tuskar/openstack/common/rpc/impl_fake.py @@ -27,7 +27,7 @@ import time import eventlet -from ironic.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common.rpc import common as rpc_common CONSUMERS = {} diff --git a/ironic/openstack/common/rpc/impl_kombu.py b/tuskar/openstack/common/rpc/impl_kombu.py similarity index 99% rename from ironic/openstack/common/rpc/impl_kombu.py rename to tuskar/openstack/common/rpc/impl_kombu.py index 3e2b7e8d..48d45e7e 100644 --- a/ironic/openstack/common/rpc/impl_kombu.py +++ b/tuskar/openstack/common/rpc/impl_kombu.py @@ -30,10 +30,10 @@ import kombu.entity import kombu.messaging from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import network_utils -from ironic.openstack.common.rpc import amqp as rpc_amqp -from ironic.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import network_utils +from tuskar.openstack.common.rpc import amqp as rpc_amqp +from tuskar.openstack.common.rpc import common as rpc_common kombu_opts = [ cfg.StrOpt('kombu_ssl_version', diff --git a/ironic/openstack/common/rpc/impl_qpid.py b/tuskar/openstack/common/rpc/impl_qpid.py similarity index 98% rename from ironic/openstack/common/rpc/impl_qpid.py rename to tuskar/openstack/common/rpc/impl_qpid.py index 7b6be3c3..edbcf597 100644 --- a/ironic/openstack/common/rpc/impl_qpid.py +++ b/tuskar/openstack/common/rpc/impl_qpid.py @@ -24,12 +24,12 @@ import eventlet import greenlet from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import jsonutils -from ironic.openstack.common import log as logging -from ironic.openstack.common.rpc import amqp as rpc_amqp -from ironic.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.rpc import amqp as rpc_amqp +from tuskar.openstack.common.rpc import common as rpc_common qpid_messaging = importutils.try_import("qpid.messaging") qpid_exceptions = importutils.try_import("qpid.messaging.exceptions") diff --git a/ironic/openstack/common/rpc/impl_zmq.py b/tuskar/openstack/common/rpc/impl_zmq.py similarity index 98% rename from ironic/openstack/common/rpc/impl_zmq.py rename to tuskar/openstack/common/rpc/impl_zmq.py index 0898a3cb..1d0e8f64 100644 --- a/ironic/openstack/common/rpc/impl_zmq.py +++ b/tuskar/openstack/common/rpc/impl_zmq.py @@ -26,12 +26,12 @@ import eventlet import greenlet from oslo.config import cfg -from ironic.openstack.common import excutils -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import jsonutils -from ironic.openstack.common import processutils as utils -from ironic.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common import excutils +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import jsonutils +from tuskar.openstack.common import processutils as utils +from tuskar.openstack.common.rpc import common as rpc_common zmq = importutils.try_import('eventlet.green.zmq') @@ -52,7 +52,7 @@ zmq_opts = [ # The module.Class to use for matchmaking. cfg.StrOpt( 'rpc_zmq_matchmaker', - default=('ironic.openstack.common.rpc.' + default=('tuskar.openstack.common.rpc.' 'matchmaker.MatchMakerLocalhost'), help='MatchMaker driver', ), diff --git a/ironic/openstack/common/rpc/matchmaker.py b/tuskar/openstack/common/rpc/matchmaker.py similarity index 98% rename from ironic/openstack/common/rpc/matchmaker.py rename to tuskar/openstack/common/rpc/matchmaker.py index b05b9e02..5b03ea97 100644 --- a/ironic/openstack/common/rpc/matchmaker.py +++ b/tuskar/openstack/common/rpc/matchmaker.py @@ -23,8 +23,8 @@ import contextlib import eventlet from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging matchmaker_opts = [ diff --git a/ironic/openstack/common/rpc/matchmaker_redis.py b/tuskar/openstack/common/rpc/matchmaker_redis.py similarity index 96% rename from ironic/openstack/common/rpc/matchmaker_redis.py rename to tuskar/openstack/common/rpc/matchmaker_redis.py index b09b1b6f..9848e57e 100644 --- a/ironic/openstack/common/rpc/matchmaker_redis.py +++ b/tuskar/openstack/common/rpc/matchmaker_redis.py @@ -20,9 +20,9 @@ return keys for direct exchanges, per (approximate) AMQP parlance. from oslo.config import cfg -from ironic.openstack.common import importutils -from ironic.openstack.common import log as logging -from ironic.openstack.common.rpc import matchmaker as mm_common +from tuskar.openstack.common import importutils +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.rpc import matchmaker as mm_common redis = importutils.try_import('redis') diff --git a/ironic/openstack/common/rpc/matchmaker_ring.py b/tuskar/openstack/common/rpc/matchmaker_ring.py similarity index 95% rename from ironic/openstack/common/rpc/matchmaker_ring.py rename to tuskar/openstack/common/rpc/matchmaker_ring.py index 30e52ca4..23b30c7a 100644 --- a/ironic/openstack/common/rpc/matchmaker_ring.py +++ b/tuskar/openstack/common/rpc/matchmaker_ring.py @@ -23,9 +23,9 @@ import json from oslo.config import cfg -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common.rpc import matchmaker as mm +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common.rpc import matchmaker as mm matchmaker_opts = [ diff --git a/ironic/openstack/common/rpc/proxy.py b/tuskar/openstack/common/rpc/proxy.py similarity index 98% rename from ironic/openstack/common/rpc/proxy.py rename to tuskar/openstack/common/rpc/proxy.py index 4ea08ed2..2383cfa9 100644 --- a/ironic/openstack/common/rpc/proxy.py +++ b/tuskar/openstack/common/rpc/proxy.py @@ -22,9 +22,9 @@ For more information about rpc API version numbers, see: """ -from ironic.openstack.common import rpc -from ironic.openstack.common.rpc import common as rpc_common -from ironic.openstack.common.rpc import serializer as rpc_serializer +from tuskar.openstack.common import rpc +from tuskar.openstack.common.rpc import common as rpc_common +from tuskar.openstack.common.rpc import serializer as rpc_serializer class RpcProxy(object): diff --git a/ironic/openstack/common/rpc/serializer.py b/tuskar/openstack/common/rpc/serializer.py similarity index 100% rename from ironic/openstack/common/rpc/serializer.py rename to tuskar/openstack/common/rpc/serializer.py diff --git a/ironic/openstack/common/rpc/service.py b/tuskar/openstack/common/rpc/service.py similarity index 90% rename from ironic/openstack/common/rpc/service.py rename to tuskar/openstack/common/rpc/service.py index 8b4cd098..72b798b1 100644 --- a/ironic/openstack/common/rpc/service.py +++ b/tuskar/openstack/common/rpc/service.py @@ -17,11 +17,11 @@ # License for the specific language governing permissions and limitations # under the License. -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import log as logging -from ironic.openstack.common import rpc -from ironic.openstack.common.rpc import dispatcher as rpc_dispatcher -from ironic.openstack.common import service +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import rpc +from tuskar.openstack.common.rpc import dispatcher as rpc_dispatcher +from tuskar.openstack.common import service LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/rpc/zmq_receiver.py b/tuskar/openstack/common/rpc/zmq_receiver.py similarity index 88% rename from ironic/openstack/common/rpc/zmq_receiver.py rename to tuskar/openstack/common/rpc/zmq_receiver.py index ca529c40..d4a22482 100755 --- a/ironic/openstack/common/rpc/zmq_receiver.py +++ b/tuskar/openstack/common/rpc/zmq_receiver.py @@ -23,9 +23,9 @@ import sys from oslo.config import cfg -from ironic.openstack.common import log as logging -from ironic.openstack.common import rpc -from ironic.openstack.common.rpc import impl_zmq +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import rpc +from tuskar.openstack.common.rpc import impl_zmq CONF = cfg.CONF CONF.register_opts(rpc.rpc_opts) diff --git a/ironic/openstack/common/service.py b/tuskar/openstack/common/service.py similarity index 96% rename from ironic/openstack/common/service.py rename to tuskar/openstack/common/service.py index 237238f7..1c4fbd08 100644 --- a/ironic/openstack/common/service.py +++ b/tuskar/openstack/common/service.py @@ -30,14 +30,14 @@ import eventlet import logging as std_logging from oslo.config import cfg -from ironic.openstack.common import eventlet_backdoor -from ironic.openstack.common.gettextutils import _ -from ironic.openstack.common import importutils -from ironic.openstack.common import log as logging -from ironic.openstack.common import threadgroup +from tuskar.openstack.common import eventlet_backdoor +from tuskar.openstack.common.gettextutils import _ +from tuskar.openstack.common import importutils +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import threadgroup -rpc = importutils.try_import('ironic.openstack.common.rpc') +rpc = importutils.try_import('tuskar.openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/setup.py b/tuskar/openstack/common/setup.py similarity index 100% rename from ironic/openstack/common/setup.py rename to tuskar/openstack/common/setup.py diff --git a/ironic/openstack/common/threadgroup.py b/tuskar/openstack/common/threadgroup.py similarity index 97% rename from ironic/openstack/common/threadgroup.py rename to tuskar/openstack/common/threadgroup.py index f3ce673d..2fd07796 100644 --- a/ironic/openstack/common/threadgroup.py +++ b/tuskar/openstack/common/threadgroup.py @@ -18,8 +18,8 @@ from eventlet import greenlet from eventlet import greenpool from eventlet import greenthread -from ironic.openstack.common import log as logging -from ironic.openstack.common import loopingcall +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import loopingcall LOG = logging.getLogger(__name__) diff --git a/ironic/openstack/common/timeutils.py b/tuskar/openstack/common/timeutils.py similarity index 100% rename from ironic/openstack/common/timeutils.py rename to tuskar/openstack/common/timeutils.py diff --git a/ironic/openstack/common/uuidutils.py b/tuskar/openstack/common/uuidutils.py similarity index 100% rename from ironic/openstack/common/uuidutils.py rename to tuskar/openstack/common/uuidutils.py diff --git a/ironic/openstack/common/version.py b/tuskar/openstack/common/version.py similarity index 98% rename from ironic/openstack/common/version.py rename to tuskar/openstack/common/version.py index edc049f4..ae270eac 100644 --- a/ironic/openstack/common/version.py +++ b/tuskar/openstack/common/version.py @@ -52,7 +52,7 @@ class VersionInfo(object): # The most likely cause for this is running tests in a tree # produced from a tarball where the package itself has not been # installed into anything. Revert to setup-time logic. - from ironic.openstack.common import setup + from tuskar.openstack.common import setup return setup.get_version(self.package) def release_string(self): diff --git a/ironic/tests/__init__.py b/tuskar/tests/__init__.py similarity index 89% rename from ironic/tests/__init__.py rename to tuskar/tests/__init__.py index 77c15eed..eb8b5ef6 100644 --- a/ironic/tests/__init__.py +++ b/tuskar/tests/__init__.py @@ -17,14 +17,14 @@ # under the License. """ -:mod:`Ironic.tests` -- ironic Unittests +:mod:`Tuskar.tests` -- tuskar Unittests ===================================================== -.. automodule:: ironic.tests +.. automodule:: tuskar.tests :platform: Unix """ -# TODO(deva): move eventlet imports to ironic.__init__ once we move to PBR +# TODO(deva): move eventlet imports to tuskar.__init__ once we move to PBR import eventlet diff --git a/ironic/tests/base.py b/tuskar/tests/base.py similarity index 94% rename from ironic/tests/base.py rename to tuskar/tests/base.py index 80a47543..602e29a6 100644 --- a/ironic/tests/base.py +++ b/tuskar/tests/base.py @@ -37,14 +37,14 @@ import testtools from oslo.config import cfg -from ironic.db import migration +from tuskar.db import migration -from ironic.common import paths -from ironic.openstack.common.db.sqlalchemy import session -from ironic.openstack.common import log as logging -from ironic.openstack.common import timeutils -from ironic.tests import conf_fixture -from ironic.tests import policy_fixture +from tuskar.common import paths +from tuskar.openstack.common.db.sqlalchemy import session +from tuskar.openstack.common import log as logging +from tuskar.openstack.common import timeutils +from tuskar.tests import conf_fixture +from tuskar.tests import policy_fixture test_opts = [ @@ -56,12 +56,12 @@ test_opts = [ CONF = cfg.CONF CONF.register_opts(test_opts) CONF.import_opt('connection', - 'ironic.openstack.common.db.sqlalchemy.session', + 'tuskar.openstack.common.db.sqlalchemy.session', group='database') -CONF.import_opt('sqlite_db', 'ironic.openstack.common.db.sqlalchemy.session') +CONF.import_opt('sqlite_db', 'tuskar.openstack.common.db.sqlalchemy.session') CONF.set_override('use_stderr', False) -logging.setup('ironic') +logging.setup('tuskar') _DB_CACHE = None diff --git a/ironic/tests/conf_fixture.py b/tuskar/tests/conf_fixture.py similarity index 89% rename from ironic/tests/conf_fixture.py rename to tuskar/tests/conf_fixture.py index e9ef9baa..ea1b8f0d 100644 --- a/ironic/tests/conf_fixture.py +++ b/tuskar/tests/conf_fixture.py @@ -19,11 +19,11 @@ import fixtures from oslo.config import cfg -from ironic.common import config +from tuskar.common import config CONF = cfg.CONF -CONF.import_opt('use_ipv6', 'ironic.netconf') -CONF.import_opt('host', 'ironic.common.service') +CONF.import_opt('use_ipv6', 'tuskar.netconf') +CONF.import_opt('host', 'tuskar.common.service') class ConfFixture(fixtures.Fixture): @@ -37,7 +37,7 @@ class ConfFixture(fixtures.Fixture): self.conf.set_default('host', 'fake-mini') self.conf.set_default('rpc_backend', - 'ironic.openstack.common.rpc.impl_fake') + 'tuskar.openstack.common.rpc.impl_fake') self.conf.set_default('rpc_cast_timeout', 5) self.conf.set_default('rpc_response_timeout', 5) self.conf.set_default('connection', "sqlite://", group='database') diff --git a/ironic/tests/db/__init__.py b/tuskar/tests/db/__init__.py similarity index 95% rename from ironic/tests/db/__init__.py rename to tuskar/tests/db/__init__.py index d8851be0..cf5d4e36 100644 --- a/ironic/tests/db/__init__.py +++ b/tuskar/tests/db/__init__.py @@ -13,4 +13,4 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from ironic.tests.db import * +from tuskar.tests.db import * diff --git a/ironic/tests/db/base.py b/tuskar/tests/db/base.py similarity index 80% rename from ironic/tests/db/base.py rename to tuskar/tests/db/base.py index 5dbe120e..b10c41fd 100644 --- a/ironic/tests/db/base.py +++ b/tuskar/tests/db/base.py @@ -13,14 +13,14 @@ # License for the specific language governing permissions and limitations # under the License. -"""Ironic DB test base class.""" +"""Tuskar DB test base class.""" -from ironic.common import context as ironic_context -from ironic.tests import base +from tuskar.common import context as tuskar_context +from tuskar.tests import base class DbTestCase(base.TestCase): def setUp(self): super(DbTestCase, self).setUp() - self.context = ironic_context.get_admin_context() + self.context = tuskar_context.get_admin_context() diff --git a/ironic/tests/drivers/__init__.py b/tuskar/tests/drivers/__init__.py similarity index 100% rename from ironic/tests/drivers/__init__.py rename to tuskar/tests/drivers/__init__.py diff --git a/ironic/tests/fake_policy.py b/tuskar/tests/fake_policy.py similarity index 100% rename from ironic/tests/fake_policy.py rename to tuskar/tests/fake_policy.py diff --git a/ironic/tests/manager/__init__.py b/tuskar/tests/manager/__init__.py similarity index 100% rename from ironic/tests/manager/__init__.py rename to tuskar/tests/manager/__init__.py diff --git a/ironic/tests/manager/test_manager.py b/tuskar/tests/manager/test_manager.py similarity index 86% rename from ironic/tests/manager/test_manager.py rename to tuskar/tests/manager/test_manager.py index 15c485d3..817efbc2 100644 --- a/ironic/tests/manager/test_manager.py +++ b/tuskar/tests/manager/test_manager.py @@ -16,11 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. -"""Test class for Ironic ManagerService.""" +"""Test class for Tuskar ManagerService.""" -from ironic.db import api as dbapi -from ironic.manager import manager -from ironic.tests.db import base +from tuskar.db import api as dbapi +from tuskar.manager import manager +from tuskar.tests.db import base class ManagerTestCase(base.DbTestCase): diff --git a/ironic/tests/policy_fixture.py b/tuskar/tests/policy_fixture.py similarity index 84% rename from ironic/tests/policy_fixture.py rename to tuskar/tests/policy_fixture.py index 421e345c..5af88c3e 100644 --- a/ironic/tests/policy_fixture.py +++ b/tuskar/tests/policy_fixture.py @@ -17,9 +17,9 @@ import os import fixtures from oslo.config import cfg -from ironic.common import policy as ironic_policy -from ironic.openstack.common import policy as common_policy -from ironic.tests import fake_policy +from tuskar.common import policy as tuskar_policy +from tuskar.openstack.common import policy as common_policy +from tuskar.tests import fake_policy CONF = cfg.CONF @@ -34,9 +34,9 @@ class PolicyFixture(fixtures.Fixture): with open(self.policy_file_name, 'w') as policy_file: policy_file.write(fake_policy.policy_data) CONF.set_override('policy_file', self.policy_file_name) - ironic_policy.reset() - ironic_policy.init() - self.addCleanup(ironic_policy.reset) + tuskar_policy.reset() + tuskar_policy.init() + self.addCleanup(tuskar_policy.reset) def set_rules(self, rules): common_policy.set_rules(common_policy.Rules( diff --git a/ironic/tests/test_dbsync.py b/tuskar/tests/test_dbsync.py similarity index 94% rename from ironic/tests/test_dbsync.py rename to tuskar/tests/test_dbsync.py index bf7b0ae7..77aa15ae 100644 --- a/ironic/tests/test_dbsync.py +++ b/tuskar/tests/test_dbsync.py @@ -18,8 +18,8 @@ # License for the specific language governing permissions and limitations # under the License. -from ironic.db import migration -from ironic.tests.db import base +from tuskar.db import migration +from tuskar.tests.db import base class DbSyncTestCase(base.DbTestCase): diff --git a/ironic/tests/test_utils.py b/tuskar/tests/test_utils.py similarity index 98% rename from ironic/tests/test_utils.py rename to tuskar/tests/test_utils.py index 712a0231..e4f9811a 100644 --- a/ironic/tests/test_utils.py +++ b/tuskar/tests/test_utils.py @@ -21,8 +21,8 @@ import os.path import mox -from ironic.common import utils -from ironic.tests import base +from tuskar.common import utils +from tuskar.tests import base class GenericUtilsTestCase(base.TestCase): diff --git a/ironic/version.py b/tuskar/version.py similarity index 92% rename from ironic/version.py rename to tuskar/version.py index 743941f2..3ae97f8b 100644 --- a/ironic/version.py +++ b/tuskar/version.py @@ -16,14 +16,14 @@ # under the License. try: - from ironic.vcsversion import version_info + from tuskar.vcsversion import version_info except ImportError: version_info = {'branch_nick': u'LOCALBRANCH', 'revision_id': 'LOCALREVISION', 'revno': 0} -IRONIC_VERSION = ['2013', '1'] -YEAR, COUNT = IRONIC_VERSION +TUSKAR_VERSION = ['2013', '1'] +YEAR, COUNT = TUSKAR_VERSION FINAL = False # This becomes true at Release Candidate time