summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-19 17:13:01 +0000
committerGerrit Code Review <review@openstack.org>2015-03-19 17:13:01 +0000
commit16d42d57d9726748624d11a76b09c79e782b95e8 (patch)
tree06bfce31ac90e1cef6fa97dffe824c0bd92c3c09 /etc
parent3336bf4305dc2db010fbfdad06df7ee4f0912ff8 (diff)
parent1bdafaabb30b54ca955b74ff31915dbd4271f34f (diff)
downloadironic-16d42d57d9726748624d11a76b09c79e782b95e8.tar.gz
Merge "Automate uefi boot iso creation for iscsi_ilo driver"
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 50787350f..f7a5eaddd 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -153,6 +153,9 @@
# value)
#isolinux_config_template=$pybasedir/common/isolinux_config.template
+# Template file for grub configuration file. (string value)
+#grub_config_template=$pybasedir/common/grub_conf.template
+
#
# Options defined in ironic.common.paths
@@ -1233,7 +1236,7 @@
#rpc_conn_pool_size=30
# Qpid broker hostname. (string value)
-#qpid_hostname=ironic
+#qpid_hostname=localhost
# Qpid broker port. (integer value)
#qpid_port=5672
@@ -1311,7 +1314,7 @@
# The RabbitMQ broker address where a single node is used.
# (string value)
-#rabbit_host=ironic
+#rabbit_host=localhost
# The RabbitMQ broker port where a single node is used.
# (integer value)