diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 18bdc37897..21d19cf6b9 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -119,6 +119,7 @@ # Default interval for running driver periodic tasks. (integer # value) +# This option is deprecated and planned for removal in a future release. #periodic_interval=60 # Name of this node. This can be an opaque identifier. It is @@ -171,6 +172,7 @@ # If set to false, the logging level will be set to WARNING # instead of the default INFO level. (boolean value) +# This option is deprecated and planned for removal in a future release. #verbose=true # The name of a logging configuration file. This file is diff --git a/ironic/common/config_generator/generator.py b/ironic/common/config_generator/generator.py index 16aa63cd4c..b58f1b6eea 100644 --- a/ironic/common/config_generator/generator.py +++ b/ironic/common/config_generator/generator.py @@ -285,6 +285,9 @@ def _print_opt(opt, group): print('# Deprecated group/name - [%s]/%s' % (deprecated_group, deprecated_name)) + if opt.deprecated_for_removal: + print('# This option is deprecated and planned for removal in a ' + 'future release.') try: if opt_default is None: print('#%s=' % opt_name)