diff --git a/etc/watcher/watcher.conf.sample b/etc/watcher/watcher.conf.sample index 7e81dd0e9..3728e07f2 100644 --- a/etc/watcher/watcher.conf.sample +++ b/etc/watcher/watcher.conf.sample @@ -1,46 +1,9 @@ [DEFAULT] # -# From watcher +# From oslo.log # -# Log output to standard error. This option is ignored if -# log_config_append is set. (boolean value) -#use_stderr = true - -# Format string to use for log messages with context. (string value) -#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s - -# Format string to use for log messages without context. (string -# value) -#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s - -# Data to append to log format when level is DEBUG. (string value) -#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d - -# Prefix each line of exception output with this format. (string -# value) -#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s - -# List of logger=LEVEL pairs. This option is ignored if -# log_config_append is set. (list value) -#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN - -# Enables or disables publication of error events. (boolean value) -#publish_errors = false - -# The format for an instance that is passed with the log message. -# (string value) -#instance_format = "[instance: %(uuid)s] " - -# The format for an instance UUID that is passed with the log message. -# (string value) -#instance_uuid_format = "[instance: %(uuid)s] " - -# Format string for user_identity field of the -# logging_context_format_string (string value) -#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s - # Print debugging output (set logging level to DEBUG instead of # default INFO level). (boolean value) #debug = false @@ -108,6 +71,46 @@ # log_config_append is set. (string value) #syslog_log_facility = LOG_USER +# Log output to standard error. This option is ignored if +# log_config_append is set. (boolean value) +#use_stderr = true + +# Format string to use for log messages with context. (string value) +#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s + +# Format string to use for log messages without context. (string +# value) +#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s + +# Data to append to log format when level is DEBUG. (string value) +#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d + +# Prefix each line of exception output with this format. (string +# value) +#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s + +# List of logger=LEVEL pairs. This option is ignored if +# log_config_append is set. (list value) +#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN + +# Enables or disables publication of error events. (boolean value) +#publish_errors = false + +# The format for an instance that is passed with the log message. +# (string value) +#instance_format = "[instance: %(uuid)s] " + +# The format for an instance UUID that is passed with the log message. +# (string value) +#instance_uuid_format = "[instance: %(uuid)s] " + +# Format string for user_identity field of the +# logging_context_format_string (string value) +#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s + +# Enables or disables fatal status of deprecations. (boolean value) +#fatal_deprecations = false + [api] @@ -486,13 +489,3 @@ # The virtual host used by the message broker (string value) #virtual_host = - - -[watcher_strategies] - -# -# From watcher -# - -# Strategies used for the optimization (dict value) -#strategies = basic:watcher.decision_engine.strategies.basic_consolidation::BasicConsolidation diff --git a/requirements.txt b/requirements.txt index ce9457d96..64f37fe52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,30 +2,33 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 -PasteDeploy>=1.5.0 +enum34;python_version=='2.7' or python_version=='2.6' +jsonpatch>=1.1 +keystonemiddleware>=2.0.0,!=2.4.0 oslo.config>=2.3.0 # Apache-2.0 oslo.db>=2.4.1 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.log>=1.8.0 # Apache-2.0 oslo.messaging>=1.16.0,!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 oslo.service>=0.7.0 # Apache-2.0 oslo.utils>=2.0.0,!=2.6.0 # Apache-2.0 +PasteDeploy>=1.5.0 +pbr>=1.6 pecan>=1.0.0 -keystonemiddleware>=2.0.0,!=2.4.0 + +# Collector +python-ceilometerclient>=1.5.0 + +# -- watcher Applier +python-cinderclient>=1.3.1 +python-glanceclient>=0.18.0 +python-neutronclient>=2.6.0 +python-novaclient>=2.28.1,!=2.33.0 +python-openstackclient>=1.5.0 +# -- + six>=1.9.0 SQLAlchemy>=0.9.9,<1.1.0 stevedore>=1.5.0 # Apache-2.0 WSME>=0.7 -jsonpatch>=1.1 -enum34;python_version=='2.7' or python_version=='2.6' - -# watcher Applier -python-novaclient>=2.28.1,!=2.33.0 -python-openstackclient>=1.5.0 -python-neutronclient>=2.6.0 -python-glanceclient>=0.18.0 -python-cinderclient>=1.3.1 - -# Collector -python-ceilometerclient>=1.5.0 diff --git a/tox.ini b/tox.ini index e1ff1b5ef..f03e7c9b4 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,7 @@ sitepackages = False commands = oslo-config-generator --namespace watcher \ --namespace keystonemiddleware.auth_token \ + --namespace oslo.log \ --namespace oslo.db \ --output-file etc/watcher/watcher.conf.sample diff --git a/watcher/common/policy.py b/watcher/common/policy.py index ec453a391..e3baf20f2 100644 --- a/watcher/common/policy.py +++ b/watcher/common/policy.py @@ -18,7 +18,7 @@ from oslo_concurrency import lockutils from oslo_config import cfg -from watcher.openstack.common import policy +from oslo_policy import policy _ENFORCER = None CONF = cfg.CONF diff --git a/watcher/opts.py b/watcher/opts.py index 5237468cd..7a23f1df1 100644 --- a/watcher/opts.py +++ b/watcher/opts.py @@ -15,9 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import itertools -from oslo_log import _options - import watcher.api.app from watcher.applier.framework import manager_applier import watcher.common.messaging.messaging_core @@ -29,12 +26,6 @@ from watcher.decision_engine.strategy.selector import default \ def list_opts(): return [ - ('DEFAULT', itertools.chain( - _options.generic_log_opts, - _options.log_opts, - _options.common_cli_opts, - _options.logging_cli_opts - )), ('api', watcher.api.app.API_SERVICE_OPTS), ('watcher_messaging', watcher.common.messaging.messaging_core.WATCHER_MESSAGING_OPTS), diff --git a/watcher/service.py b/watcher/service.py index 79c222fec..a4f3302eb 100644 --- a/watcher/service.py +++ b/watcher/service.py @@ -21,14 +21,6 @@ from oslo_log import log LOG = log.getLogger(__name__) -service_opts = [ - cfg.StrOpt('dummy', - default="dummy string", - help='help dummy') -] - -cfg.CONF.register_opts(service_opts) - def prepare_service(args=None, conf=cfg.CONF): log.register_options(conf)