summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-27 19:32:48 +0000
committerGerrit Code Review <review@openstack.org>2017-11-27 19:32:48 +0000
commit259a2057efbb07d2dd48f7feb309c7f573c81428 (patch)
tree777af98f03fdeab5531a540bff0979af837a8bfc /etc
parent52f20d156544d7e4c6d1473bc8fd35732b28d21c (diff)
parentb5f3dfc2884e986121bf9c92e2e0ca1c1dca71b1 (diff)
downloadironic-259a2057efbb07d2dd48f7feb309c7f573c81428.tar.gz
Merge "ironic.conf.sample includes default_resource_class"
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 000724101..4fd7bff22 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -20,6 +20,10 @@
# value)
#pecan_debug = false
+# Resource class to use for new nodes when no resource class
+# is provided in the creation request. (string value)
+#default_resource_class = <None>
+
# Specify the list of drivers to load during service
# initialization. Missing drivers, or drivers which fail to
# initialize, will prevent the conductor service from
@@ -1092,7 +1096,7 @@
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
# Reason: Use [cinder]/endpoint_override option to set a
-# specific cinder API url to connect to.
+# specific cinder API URL to connect to.
#url = <None>
# User's domain id (string value)