openstack
/
ironic
Code Issues Proposed changes

Improve options help for image caching 

Point how to turn image caching off.

Change-Id: I75e7aac5ca5120839ed7ca2ba43d40c981790f40
This commit is contained in:
Pavlo Shchelokovskyy 2015-11-26 10:41:44 +00:00
parent 09550ff1a4
commit 37f20be9c9
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1886,7 +1886,8 @@
#images_path=/var/lib/ironic/images/
# On the ironic-conductor node, directory where master
# instance images are stored on disk. (string value)
# instance images are stored on disk. Setting to <None>
# disables image caching. (string value)
#instance_master_path=/var/lib/ironic/master_images
# Maximum size (in MiB) of cache for master images, including
@ -1923,7 +1924,8 @@
#tftp_root=/tftpboot
# On ironic-conductor node, directory where master TFTP images
# are stored on disk. (string value)
# are stored on disk. Setting to <None> disables image
# caching. (string value)
#tftp_master_path=/tftpboot/master_images
# Bootfile DHCP parameter. (string value)

1
ironic/drivers/modules/image_cache.py
View File

@ -64,6 +64,7 @@ class ImageCache(object):
"""Constructor.
:param master_dir: cache directory to work on
Value of None disables image caching.
:param cache_size: desired maximum cache size in bytes
:param cache_ttl: cache entity TTL in seconds
"""

3
ironic/drivers/modules/iscsi_deploy.py
View File

@ -60,7 +60,8 @@ pxe_opts = [
cfg.StrOpt('instance_master_path',
default='/var/lib/ironic/master_images',
help=_('On the ironic-conductor node, directory where master '
'instance images are stored on disk.')),
'instance images are stored on disk. '
'Setting to <None> disables image caching.')),
cfg.IntOpt('image_cache_size',
default=20480,
help=_('Maximum size (in MiB) of cache for master images, '

3
ironic/drivers/modules/pxe.py
View File

@ -63,7 +63,8 @@ pxe_opts = [
cfg.StrOpt('tftp_master_path',
default='/tftpboot/master_images',
help=_('On ironic-conductor node, directory where master TFTP '
'images are stored on disk.')),
'images are stored on disk. '
'Setting to <None> disables image caching.')),
# NOTE(dekehn): Additional boot files options may be created in the event
# other architectures require different boot files.
cfg.StrOpt('pxe_bootfile_name',