openstack/ironic
Code Issues Proposed changes

Merge "Replace 'metrics' with 'meters' in option"

Browse Source
This commit is contained in:
Jenkins 2015-04-16 17:57:04 +00:00 committed by Gerrit Code Review
commit d499734509
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/ironic/ironic.conf.sample
View File

@ -488,7 +488,7 @@
# ceilometer via the notification bus. (integer value) # ceilometer via the notification bus. (integer value)
#send_sensor_data_interval=600 #send_sensor_data_interval=600
# List of comma separated metric types which need to be sent # List of comma separated meter types which need to be sent
# to Ceilometer. The default value, "ALL", is a special value # to Ceilometer. The default value, "ALL", is a special value
# meaning send all the sensor data. (list value) # meaning send all the sensor data. (list value)
#send_sensor_data_types=ALL #send_sensor_data_types=ALL

2
ironic/conductor/manager.py
View File

@ -144,7 +144,7 @@ conductor_opts = [
' to ceilometer via the notification bus.'), ' to ceilometer via the notification bus.'),
cfg.ListOpt('send_sensor_data_types', cfg.ListOpt('send_sensor_data_types',
default=['ALL'], default=['ALL'],
help='List of comma separated metric types which need to be' help='List of comma separated meter types which need to be'
' sent to Ceilometer. The default value, "ALL", is a ' ' sent to Ceilometer. The default value, "ALL", is a '
'special value meaning send all the sensor data.' 'special value meaning send all the sensor data.'
), ),