Commit Graph

63 Commits

Author SHA1 Message Date
liusheng 362bfd763c Remove openstack-common.conf
The change Ib30f681ccd9177c45d2c17d28b4a46ac5462df7c tried to remove this
file, but it only removed the content of this file.

Change-Id: I82769091947d3c593509f1d2012cd6f0bc371da5
2016-05-11 09:31:21 +08:00
caoyue adf595c3cf remove openstack-common.conf
We don't sync from oslo-incubator, so don't need this file any more.

Change-Id: Ib30f681ccd9177c45d2c17d28b4a46ac5462df7c
2016-01-08 12:58:59 +08:00
Sergey Vilgelm 38c85a8854 Switch to the oslo_utils.fileutils
fileutils is graduated in the oslo.utils library.

Implements: blueprint graduate-fileutils[1]
[1] https://blueprints.launchpad.net/oslo-incubator/+spec/graduate-fileutils

Depends-On: I51ba9076e1fbc16145ee2311f47b7768c16dcb20 (requirements)

Change-Id: I933d02aa48260069149d16caed02b020296b943a
2015-07-15 08:09:26 +03:00
Elena Ezhova 6e693fc91d Switch to oslo.service
oslo.service has graduated, so neutron should consume it.

Closes-Bug: #1466851
Depends-On: Ie0fd63f969f954029c3c3cf31337fbe38f59331a
Depends-On: I2093b37d411df9a26958fa50ff523c258bbe06ec
Depends-On: I4823d344878fc97e66ddd8fdae25c13a34dede40
Change-Id: I0155b3d8b72f6d031bf6f855488f80acebfc25d4
2015-06-29 13:20:55 +03:00
Davanum Srinivas 0e48d9d203 cleanup openstack-common.conf and sync updated files
Periodic update of latest files from oslo-incubator

Change-Id: Ie7eb02e4e9277c18abfb438b6cf710e0aa426b15
2015-06-19 20:01:01 +00:00
Jenkins 9d649129ca Merge "Consume oslo.policy" 2015-06-11 06:04:10 +00:00
Ihar Hrachyshka 9143ce10e4 Consume oslo.policy
Some non intrusive changes to tests are needed, so that we don't rely on
library symbols that are now private (f.e. parse_rule).

Closes-Bug: #1458945
Change-Id: I90326479e908042fec9ecb25fa19a8dd5b15e7d8
2015-06-09 17:07:13 +00:00
Ihar Hrachyshka 74dcc91aa8 versionutils: switch from incubator version to oslo.log
Note that we require oslo.log >= 1.2.0 since it's the first release that
included the module.

Change-Id: I2b7d587d8c4b0c885873c9c8083abb8fc35780c9
2015-06-04 17:59:38 +02:00
Ihar Hrachyshka 29ea643607 Remove middleware oslo-incubator module
The module was used during Kilo cycle to provide backwards compatibility
for users that upgrade to the release without updating their
api-paste.ini. We have issued the deprecation warning for a cycle now,
so we should be ok to just drop the compatibility layer.

Note that the change may require a notion in release notes to make sure
everyone is notified, even if they don't look through their logs.

DocImpact

Change-Id: I41693f4613b5a69a01a33e54f90e82177f42e1af
2015-05-20 23:17:19 +02:00
Ihar Hrachyshka 22328baf1f Migrate to oslo.log
It's mostly a matter of changing imports to a new location.

Non-obvious changes needed:
* pass overwrite= argument to oslo_context since oslo.log reads context
  from its thread local store and not local.store from incubator
* don't store context at local.store now that there is no code that
  would consume it
* LOG.deprecated() -> versionutils.report_deprecated_feature()
* dropped LOG.audit check from hacking rule since now the method does
  not exist
* WritableLogger is now located in oslo_log.loggers

Dropped log module from the tree. Also dropped local module that is now
of no use (and obsolete, as per oslo team).

Added versionutils back to openstack-common.conf since now we use the
module directly from neutron code and not just as a dependency of some
other oslo-incubator module.

Note: tempest tests are expected to be broken now, so instead of fixing
all the oslo.log related issues for the subtree in this patch, I only
added TODOs with directions for later fix.

Closes-Bug: #1425013
Change-Id: I310e059a815377579de6bb2aa204de168e72571e
2015-03-12 11:22:56 +01:00
Ihar Hrachyshka 35d838ff60 Migrate to oslo.concurrency
Namespaces are not used anymore, so imports are for oslo_concurrency,
not oslo.concurrency.

lockutils direct call is not supported anymore, so using shipped
lockutils-wrapper instead.

Use ExternalLockFixture to set lock_path for unit testing.

Updated cache and cache/_backends module from oslo-incubator to use
oslo.concurrency and not incubator version of lockutils module.

Dropped lockutils incubator module that is now moved to oslo.concurrency. Not
dropping fixture module that includes lockutils fixture since other fixtures
are still used in the tree.

Closes-Bug: #1387092
Change-Id: I2ba2295f8f5d55f272a9d23555940586b25b5a1c
2015-01-15 21:01:06 +01:00
Ihar Hrachyshka 53c7d82c68 Dropped fixture module
The only single remaining usage of those fixtures in the tree was for
oslo.config fixture, which is now available via oslo.config library
itself.

Change-Id: I997a3a086598a8addf093790db102cd130588d95
Closes-Bug: #1399804
2015-01-15 15:13:40 +01:00
Jenkins 0f349d297c Merge "Have L3 agent catch the correct exception" 2014-12-15 16:25:12 +00:00
Ihar Hrachyshka 089e60a68b Migrate to oslo.context
That's just a matter of adding requirements.txt entry, fixing imports,
and dropping the corresponding oslo-incubator module from the tree.

While at it, made all imports to import the module into 'oslo_context' and
not just 'context', so that we don't override the module locally in
multiple methods that receive their context arguments with the same
name, making the library inaccessible from inside those methods.

Change-Id: Ie62af970b3b7f225de453e56c01abc4b12af8f5e
Closes-Bug: #1401054
2014-12-11 20:49:11 +01:00
Terry Wilson 4cfe2fc98a Have L3 agent catch the correct exception
L3 agent imports the processutils module to catch exceptions that
wouldn't ever be thrown because the underlying execute() being
called is the one from neutron.agent.linux.utils which raises a
RuntimeError on failure.

Also, processutils is now part of oslo.concurrency. So when we
actually start using it, we'll use it from there.

Closes-Bug: 1401626
Change-Id: I43874e1b63a0ba7b01415cafe0538f4343057066
2014-12-11 18:09:04 +00:00
Ihar Hrachyshka 3f44c9e278 Migrate to oslo.i18n
Mostly trivial import changes.

- oslo.i18n no longer provide install() method to inject _() into
  globals(), so removed all calls to it;
- removed Babel from dependencies (it will now be grabbed by oslo.i18n);
- updated tox.ini to ignore import violations for oslo.i18n.

Change-Id: I6623d551f512fb7fe9bf35ee734ed6d4c6cbc287
2014-11-26 22:19:24 +01:00
gordon chung 064f763bb5 Migrate to oslo.middleware
Synced middleware module from incubator instead of removing it
completely. This is needed for grenade and to keep backwards
compatibility with existing installations with old api-paste.ini.

'log' module is updated as a dependency for middleware module.

'versionutils' are added as a new dependency for middleware module.

Closes-Bug: #1371701
Change-Id: Ib1c3161ccc98642091134f2285fed7c90244e600
Co-Authored-By: Ihar Hrachyshka <ihrachys@redhat.com>
2014-11-26 22:12:21 +01:00
Ihar Hrachyshka dac6a0c79e Migrate to oslo.utils
The following modules are removed:
  - excutils,
  - importutils,
  - network_utils,
  - strutils,
  - timeutils.

Closes-Bug: #1385355
Change-Id: I1f34f17f5dbf37032584008f27e65d4dc4d475f4
2014-11-26 10:31:03 +01:00
gordon chung 1d9c7d5c79 switch to oslo.serialization
jsonutils has been moved to the oslo.serialization library. in this
patch we bring in oslo.serialization and switch all references to
the new library.

Closes-Bug: #1385353
Change-Id: I2898c4040abb2f208959049708e7bc093cfbaba7
2014-11-14 09:28:12 +00:00
Ihar Hrachyshka 652052860f Drop sslutils and versionutils modules
The modules are not used since when we've switched to oslo.messaging.

Change-Id: Ife4298e0bb29ec15404fafe4b48545bd65e038e3
2014-10-10 20:53:46 +02:00
Roman Podoliaka abd1b652f7 Switch to using of oslo.db
oslo.db first stable release has been cut and we can start using it
instead of openstack/common/db/* code which is now marked obsolete.

Change-Id: I1ccf896922a5a762d37a1a3b93c56c8b8ae8c085
2014-06-30 14:07:59 +03:00
Jenkins ae632788bf Merge "Synced log module and its dependencies from olso-incubator" 2014-06-27 14:29:58 +00:00
Gordon Chung 5966cab7a7 remove unsupported middleware
the audit and notifier middleware from oslo-incubator are not
compatible with oslo.messaging. remove these middleware.

Change-Id: I456c2aa5f24ef977949f589f72d521514d5e97e4
2014-06-26 18:24:44 -04:00
Ihar Hrachyshka 1730f0016a Synced log module and its dependencies from olso-incubator
Old version of 'log' module depended on oslo-incubator RPC layer
implementation. This sync is intended to copy the following fix that
makes log module use oslo.messaging.notify.log_handler if available:

  * 109e325e: Use oslo.messaging to publish log errors

blueprint oslo-messaging

Change-Id: Ieb26df4e9fbb2aa4d319c79be7510006fc8461ab
2014-06-24 21:00:26 +00:00
Ihar Hrachyshka da72b2646d Removed 'rpc' and 'notifier' incubator modules
Port to oslo.messaging is done, so remove now unused pieces from the
tree.

Also removed obsolete bin/quantum-rpc-zmq-receiver. It comes from old
days of oslo-rpc, it was reimplemented later as
openstack/common/rpc/zmq_receiver.py in oslo-incubator, and we've
removed the whole tree for old RPC layer anyway.

blueprint oslo-messaging

Change-Id: If7155c59c8ef58d06164938998180f3367b9bb16
2014-06-20 20:44:53 +02:00
Ihar Hrachyshka 2dcdd3bdb7 Synced jsonutils from oslo-incubator
The sync includes change that makes sure we get unicode-only dicts from
jsonutils no matter which json module implementation is selected.

The latest commit in oslo-incubator:
- 0f4586c0076183c6356eec682c8a593648125abd

The sync adds a new 'strutils' module that is now used in jsonutils.

Change-Id: Ic815ca3df94c33edec9104172048b2cd94b92e3f
Closes-Bug: 1314129
2014-05-27 12:17:14 +02:00
Jakub Libosvar 149679b2dc Sync service and systemd modules from oslo-incubator
This patch make systemd know when neutron-service was started. This is
needed in HA environment, previously systemd returned success even
before neutron-server was able to handle requests.

Current oslo-incubator commit on HEAD:
b7ad6ddab8b1d61bf4f52ccaa461a9d68809747b

Implements: blueprint service-readiness
Change-Id: Ic9e4abd11b614a896fbd7454b9a604a69a248d0f
2014-04-04 12:16:50 +02:00
Jenkins 5db3457664 Merge "Remove dependent module py3kcompat" 2014-02-23 06:30:59 +00:00
Jakub Libosvar 494a0f844d Copy cache package from oslo-incubator
Related-Bug: #1276440
Change-Id: I7aaf8ae2eb909816d85092baa5c111f00e60d2c7
2014-02-20 15:00:34 +01:00
llg8212 026bb068a5 Remove dependent module py3kcompat
Module py3kcompat was removed from oslo-incubator, we can use
six directly.

* Sync commit of removing py3kcompat from oslo
* use six replace usage of py3kcompat

Change-Id: Ifc9be2cc36c93d298402bd430be35b541c9b7eba
Closes-Bug: #1280033
2014-02-17 15:14:56 +08:00
Jenkins 905d0f5916 Merge "Use oslo.rootwrap library instead of local copy" 2014-02-11 01:53:53 +00:00
Akihiro Motoki 048faa5703 Return request-id in API response
Import RequestIdMiddleware from oslo which ensures to request-id
in API response. CatchErrorsMiddleware is also imported to ensure
all internal exceptions are caught outermost.
api-paste.ini is updated to use them.

KeystonAuthContext middleware is updated so that it uses
request-id generated by RequestIdMiddleware.

Add middleware to openstack.conf and import all modules
under middleware directory from oslo.

DocImpact UpgradeImpact
This patch adds new WSGI middlewares "request_id" and "catch_errors".
They needs to be added to api-paste.ini when upgrading.

Change-Id: Icf01b7de697ef50bef53212da2cf520d1ff78b88
Closes-Bug: #1239923
2014-02-10 04:58:38 +09:00
Thierry Carrez 171efa46e0 Use oslo.rootwrap library instead of local copy
Remove rootwrap code copied from oslo-incubator, make the
{neutron,quantum}-rootwrap console_script entrypoints point to
oslo.rootwrap code instead.

Adjust bin/{neutron,quantum}-rootwrap[-xen-dom0] so that it calls
into oslo.rootwrap.cmd.

Change-Id: I22df4060d6bca6affd7761fec49d2767ca8f59cf
Implements: blueprint neutron-oslo-rootwrap
2014-02-07 10:58:27 +01:00
Gary Kotton 4dbb55cbb0 Update RPC code from oslo
The common RPC code has been updated to include the following:
    8575d87af49ea276341908f83c8c51db13afca44
    8b2b0b743e84ceed7841cf470afed6a5da8e1d07
    23f602940c64ba408d77ceb8f5ba0f67ee4a18ef
    6d0a6c3083218cdac52758a8b6aac6b03402c658
    7cac1ac1bd9df36d4e5183afac3b643df10b1d4d
    8159efddabb09dd9b7c99963ff7c9de0a6c62b62

Updated to include the following in modules in openstack-common.conf:
py3kcompat, sslutils, and versionutils.

The update also includes imports from the RPC code

Change-Id: I84c5b8e2b17da0018dd69ecb354d123a609afe98
2014-01-15 04:26:57 -08:00
Ann Kamyshnikova eece55ceb6 Update lockutils and fixture in openstack.common
lockutils: included commits:
  8b2b0b7 Use hacking import_exceptions for gettextutils._
  6d0a6c3 Correct invalid docstrings
  12bcdb7 Remove vim header
  79e6bc6 fix lockutils.lock() to make it thread-safe
  ace5120 Add main() to lockutils that creates temp dir for locks
  537d8e2 Allow lockutils to get lock_path conf from envvar
  371fa42 Move LockFixture into a fixtures module
  d498c42 Fix to properly log when we release a semaphore
  29d387c Add LockFixture to lockutils
  3e3ac0c Modify lockutils.py due to dispose of eventlet
  90b6a65 Fix locking bug
  27d4b41 Move synchronized body to a first-class function
  15c17fb Make lock_file_prefix optional
  1a2df89 Enable H302 hacking check

fixture: created, included commits:
  45658e2 Fix violations of H302:import only modules
  12bcdb7 Remove vim header
  3970d46 Fix typos in oslo
  371fa42 Move LockFixture into a fixtures module
  f4a4855 Consolidate the use of stubs
  6111131 Make openstack.common.fixture.config Py3 compliant
  3906979 Add a fixture for dealing with config
  d332cca Add a fixture for dealing with mock patching.
  1bc3ecf Start adding reusable test fixtures.

Also tox.ini was corrected to let lockutils work in tests.

This change is needed for work on bp: db-sync-models-with-migrations

Closes-Bug: #1065531

Change-Id: I139f30b4767ff2c9d1f01ee728823859c09b3859
2014-01-09 15:59:10 +04:00
Chang Bo Guo 932d354991 Fix import log_handler error with publish_errors set
Sync from Olso.
Commit Id is Ibf28ba17f81b5ddeda653f6a3501ecac18ffcd42

This handler sends all error logs as rpc notifications.
Note: when using publish_errors you also need to set the
notification_driver option too.

Closes-bug: #1240349
Change-Id: Ie66b23af8da2e439e0ac2f5677f6a064e3dd3133
2013-11-05 22:47:32 -08:00
Mark McLoughlin a764f78327 Remove obsolete redhat-eventlet.patch
See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gorey details on
why this exists.

As of this fix:

  https://github.com/eventlet/eventlet/pull/34

which was released in eventlet 0.13, we no longer need the patch.

This has now been removed from oslo-incubator, so this is really just
syncing that removal.

Change-Id: I84267f3c6726cb2e750f615e107c48b12c6ed353
2013-10-09 21:47:48 +01:00
Julien Danjou 9b50a25c28 Remove openstack.common.exception usage
This file is deprecated, stop using it.

Change-Id: I5d79b8c0134bb5f4021487542d4d0a964281b8bf
Fixes-Bug: #1208734
2013-08-06 10:42:02 +02:00
Mark McClain ee3fe4e836 Rename Quantum to Neutron
This change renames everything to Neutron while providing backwards
compatible adjustments for Grizzly configuration files.

implements blueprint: remove-use-of-quantum

Change-Id: Ie7d07ba7c89857e13d4ddc8f0e9b68de020a3d19
2013-07-06 15:02:43 -04:00
Gary Kotton 9f0c2453c6 Update to use OSLO db
This code implements the blueprint oslo-db-support

NOTES:
1. The new section is database (this is backward compatible
   with DATABASE)
2. The sql_* are deprecated. They are also backward compatible.
3. Eventlets DB pool is no longer supported

Change-Id: I6fa7c3817f6a5d8bef48382e0e754b88521f2289
2013-06-25 11:21:32 +00:00
Monty Taylor bdba865d77 Move to pbr.
Closes bug 1179007

Change-Id: I3666e373389da6ad9a21a195a42918d4dec50cb5
2013-05-17 08:31:44 -07:00
Mark McLoughlin 9581e5b71b Copy the RHEL6 eventlet workaround from Oslo
Tests in oslo-incubator now need the horrendous hack to workaround an
issue with eventlet on RHEL6. We've moved the patch_tox_venv tool
and redhat-eventlet.patch into oslo-incubator, so add them to
openstack-common.conf.

Change-Id: I1acfec282b64d7582144b155119bedb1741db2f7
2013-05-02 10:31:16 +01:00
Zhongyue Luo 6d211d4da4 Reformat openstack-common.conf
Use the new 'module' option in openstack-common.conf which is a
multi-string option, allowing each module name to be placed on a
separate line.

This makes it much easier to review changes to the modules list.

Change-Id: I64dff89639f9d136ded3d25aab9f8f85a2d7112b
2013-04-06 11:06:41 +08:00
Mark McLoughlin cfda6bc4fb Use oslo-config-2013.1b3
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.

Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.

Remove the 'deps = pep8' from tox.ini as it means all the other deps
get installed with easy_install which can't install oslo-config from
the URL.

Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
2013-02-17 17:33:05 +00:00
Alessio Ababilov 8789704221 Synchronize code from oslo
Use commit eaab5fae2502198e9fa57d0d90a7204a2bd83b16:
Merge "sort options to make --help output prettier"
(Wed Feb 13 12:52:14 2013 +0000)

Add processutils to quantum since impl_zmq depends on them.

Drop notifier.list_notifier that is not present in oslo.

Change-Id: I91d9ec05481b8c24da9fbee1ad4706ff56a3b7aa
Fixes: bug #1116290
2013-02-13 17:43:40 +02:00
Matthew Treinish 672549dd4b Use install_venv_common.py from oslo.
This syncs install_venv_common.py from oslo and reworks the
tools/install_venv.py script to use the new library.

Change-Id: I46bbf7d656e6cb9660e37af2d3ce96150e18e7fe
2013-01-28 16:22:17 -05:00
gongysh b836e71eb1 l3 agent rpc
On one hand, we sync router data (including routers,
their gw ports, interfaces and floatingips) from l3_agent
to quantum server periodically if needed.

On the other hand, we notify l3 agent from quantum server when
we delete or update a router's stuff, such as floating IP,
interface and gwport and router itself.

blueprint rpc-for-l3-agent
bug #1080286

Change-Id: I60f3081975fc7164b22f9e9fa941e702a3f4c663
2012-12-04 16:46:44 +08:00
Nachi Ueno 12674de396 Add QUANTUM_ prefix for env used by quantum-debug
Fixes bug 1077204
from TEST_CONFIG_FILE to QUANTUM_TEST_CONFIG_FILE
also fixes openstack-common style

Change-Id: I03d386dd5fc28d91ef496aecb1b93ddb4f4a810d
2012-11-09 13:38:40 -08:00
Nachi Ueno ab6de7f51a Import lockutils and fileutils from openstack-common
File lock function is needed to support iptables-based security group
implementation.

This is used by bp quantum-security-groups-iptables
Change-Id: Id9c116a1e10e5c240913fae7a127110b806eff0f
2012-11-08 14:31:44 -08:00
Monty Taylor d65bca867c Updated openstack-common setup and version code.
Updating setup and version require code changes in the code base. This is done
here to support Id9c116a1e10e5c240913fae7a127110b806eff0f

Change-Id: I60b6dd6d684982e33de8fbf051a3dcaf98cb9b87
2012-11-08 09:21:34 +08:00