diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index ccf368f0da..5539dd0bb3 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -488,7 +488,7 @@ # ceilometer via the notification bus. (integer value) #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 # meaning send all the sensor data. (list value) #send_sensor_data_types=ALL diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index c2b75bca0b..8eba33786a 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -144,7 +144,7 @@ conductor_opts = [ ' to ceilometer via the notification bus.'), cfg.ListOpt('send_sensor_data_types', 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 ' 'special value meaning send all the sensor data.' ),