diff --git a/ceilometer/collector.py b/ceilometer/collector.py index 4537a5b6b5..6ac2cab1d1 100644 --- a/ceilometer/collector.py +++ b/ceilometer/collector.py @@ -44,7 +44,7 @@ OPTS = [ help='Number of notification messages to wait before ' 'dispatching them'), cfg.IntOpt('batch_timeout', - help='Number of seconds to wait before dispatching samples' + help='Number of seconds to wait before dispatching samples ' 'when batch_size is not reached (None means indefinitely)'), cfg.IntOpt('workers', default=1, diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index 5991661993..2d6c7c143c 100644 --- a/ceilometer/compute/discovery.py +++ b/ceilometer/compute/discovery.py @@ -43,7 +43,7 @@ OPTS = [ cfg.StrOpt('instance_discovery_method', default='libvirt_metadata', choices=['naive', 'workload_partitioning', 'libvirt_metadata'], - help="Ceilometer offers many methods to discover the instance" + help="Ceilometer offers many methods to discover the instance " "running on a compute node: \n" "* naive: poll nova to get all instances\n" "* workload_partitioning: poll nova to get instances of " diff --git a/ceilometer/compute/pollsters/net.py b/ceilometer/compute/pollsters/net.py index ef0d3cf321..933d657786 100644 --- a/ceilometer/compute/pollsters/net.py +++ b/ceilometer/compute/pollsters/net.py @@ -104,7 +104,7 @@ class _Base(pollsters.BaseComputePollster): except ceilometer.NotImplementedError: # Selected inspector does not implement this pollster. LOG.debug('%(inspector)s does not provide data for ' - ' %(pollster)s', + '%(pollster)s', {'inspector': self.inspector.__class__.__name__, 'pollster': self.__class__.__name__}) raise plugin_base.PollsterPermanentError(resources) diff --git a/ceilometer/coordination.py b/ceilometer/coordination.py index 324afe1a8c..40e64787df 100644 --- a/ceilometer/coordination.py +++ b/ceilometer/coordination.py @@ -43,7 +43,7 @@ OPTS = [ 'membership has changed'), cfg.IntOpt('retry_backoff', default=1, - help='Retry backoff factor when retrying to connect with' + help='Retry backoff factor when retrying to connect with ' 'coordination backend'), cfg.IntOpt('max_retry_interval', default=30, diff --git a/ceilometer/notification.py b/ceilometer/notification.py index 467c523656..c745ee950a 100644 --- a/ceilometer/notification.py +++ b/ceilometer/notification.py @@ -64,11 +64,11 @@ OPTS = [ cfg.IntOpt('batch_size', default=100, min=1, help='Number of notification messages to wait before ' - 'publishing them. Batching is advised when transformations are' + 'publishing them. Batching is advised when transformations are ' 'applied in pipeline.'), cfg.IntOpt('batch_timeout', default=5, - help='Number of seconds to wait before publishing samples' + help='Number of seconds to wait before publishing samples ' 'when batch_size is not reached (None means indefinitely)'), cfg.IntOpt('workers', default=1, diff --git a/ceilometer/storage/hbase/utils.py b/ceilometer/storage/hbase/utils.py index dc050f4b05..d6f9718bee 100644 --- a/ceilometer/storage/hbase/utils.py +++ b/ceilometer/storage/hbase/utils.py @@ -424,7 +424,7 @@ def create_tables(conn, tables, column_families): separator=conn.table_prefix_separator, table_name=table)) - LOG.warning(_("Cannot create table %(table_name)s " + LOG.warning(_("Cannot create table %(table_name)s, " "it already exists. Ignoring error") % {'table_name': table}) diff --git a/ceilometer/utils.py b/ceilometer/utils.py index 0d4998a5b2..e8b51e4078 100644 --- a/ceilometer/utils.py +++ b/ceilometer/utils.py @@ -41,7 +41,7 @@ ROOTWRAP_CONF = "/etc/ceilometer/rootwrap.conf" OPTS = [ cfg.StrOpt('rootwrap_config', default=ROOTWRAP_CONF, - help='Path to the rootwrap configuration file to' + help='Path to the rootwrap configuration file to ' 'use for running commands as root'), ]