summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-25 22:23:09 +0000
committerGerrit Code Review <review@openstack.org>2014-04-25 22:23:09 +0000
commit8acd323c761505e3e0b76e73876190e46a1eeabb (patch)
treeff8522bcc0114dc1c0ba80e1e1a773ff86909e2b /etc
parent580ee8f065b377a853e94116bff98a13cec49ff4 (diff)
parent89ba0fe7f775fd0a942f3e5eebe192c96a42b1a7 (diff)
downloadironic-8acd323c761505e3e0b76e73876190e46a1eeabb.tar.gz
Merge "nova.virt.ironic passes ephemeral_gb to ironic"
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 6ecead896..21e3924c9 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -866,6 +866,10 @@
# Template file for PXE configuration. (string value)
#pxe_config_template=$pybasedir/drivers/modules/pxe_config.template
+# Default file system format for ephemeral partition, if one
+# is created. (string value)
+#default_ephemeral_format=ext4
+
# IP address of Ironic compute node's tftp server. (string
# value)
#tftp_server=$my_ip