Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update requirements from OS Global Requirements.

Browse Source 
Update requirements.txt and test-requirements.txt from Global Requirements
defined into openstack/requirements project (stable/liberty).

Change-Id: I9ecbf5a7fb2c38624cc4f52b13515f8af75a4889
Closes-Bug: #1513118
This commit is contained in:
David TARDIVEL
2015-11-23 15:35:10 +01:00
committed by Vincent Françoise
parent 7c52a1448d
commit 7c8acebcb2
16 changed files with 50 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/common/messaging/notification_handler.py
View File

@@ -15,8 +15,8 @@
# limitations under the License.
import eventlet
from oslo import messaging
from oslo_log import log
import oslo_messaging as messaging
from watcher.common.messaging.utils.observable import \
Observable

5
watcher/common/service.py
View File

@@ -17,10 +17,11 @@
import signal
import socket
from oslo import messaging
from oslo_config import cfg
from oslo_log import _options
from oslo_log import log
import oslo_messaging as messaging
from oslo_service import service
from oslo_utils import importutils
from watcher.common import config
@@ -29,7 +30,6 @@ from watcher.common.i18n import _LE
from watcher.common.i18n import _LI
from watcher.common import rpc
from watcher.objects import base as objects_base
from watcher.openstack.common import service
service_opts = [
@@ -125,6 +125,7 @@ _DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'qpid.messaging=INFO',
def prepare_service(argv=[]):
log.register_options(cfg.CONF)
config.parse_args(argv)
cfg.set_defaults(_options.log_opts,
default_log_levels=_DEFAULT_LOG_LEVELS)