summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRuby Loo <ruby.loo@intel.com>2018-01-11 10:03:36 -0500
committerRuby Loo <ruby.loo@intel.com>2018-01-11 10:07:04 -0500
commitfb47f179a94b5a5949dee39d651aa743ac85da81 (patch)
tree937354bce0cdf54c0af0a6b917e6b06e744b71f6 /etc
parenteef73d257f25a40bba18f0f9b4c25d32a175b148 (diff)
downloadironic-fb47f179a94b5a5949dee39d651aa743ac85da81.tar.gz
Add release 10.0 to release mappings
This adds a '10.0' entry to the release mappings -- used for rolling upgrades. This is part of the process for preparing for the 10.0 release (https://docs.openstack.org/ironic/latest/contributor/releasing.html#things-to-do-before-releasing) Change-Id: I157d77a231022d9c67d076163fb4aff91e830421
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample11
1 files changed, 10 insertions, 1 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 1ef285d50..eb3d1341c 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -397,7 +397,7 @@
# doing a rolling upgrade from version N to version N+1, set
# (to pin) this to N. To unpin (default), leave it unset and
# the latest versions will be used. (string value)
-# Allowed values: pike, 9.2, 9.1, 9.0, 8.0
+# Allowed values: pike, 9.2, 9.1, 9.0, 8.0, 10.0
#pin_release_version = <None>
# Path to the rootwrap configuration file to use for running
@@ -3656,6 +3656,15 @@
# From oslo.policy
#
+# This option controls whether or not to enforce scope when
+# evaluating policies. If ``True``, the scope of the token
+# used in the request is compared to the ``scope_types`` of
+# the policy being enforced. If the scopes do not match, an
+# ``InvalidScope`` exception will be raised. If ``False``, a
+# message will be logged informing operators that policies are
+# being invoked with mismatching scope. (boolean value)
+#enforce_scope = false
+
# The file that defines policies. (string value)
#policy_file = policy.json