summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-01 19:23:30 +0000
committerGerrit Code Review <review@openstack.org>2015-12-01 19:23:30 +0000
commit1d6f6586abe4d6df5c477cfaef16783163a69f93 (patch)
tree13b04b0efd39e328fd40ab959717b21b7be652a7 /etc
parent215f37ba043e63cd520c65caaa163dda3f583f82 (diff)
parent37f20be9c9f4c1c45e4e77adb70cccde3bd96de1 (diff)
downloadironic-1d6f6586abe4d6df5c477cfaef16783163a69f93.tar.gz
Merge "Improve options help for image caching"
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample6
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 884bfc074..56a9df695 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -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)