Merge "Add release 10.0 to release mappings"

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
 

ironic/common/release_mappings.py

@@ -107,6 +107,19 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '10.0': {
+        'api': '1.36',
+        'rpc': '1.42',
+        'objects': {
+            'Node': ['1.22'],
+            'Conductor': ['1.2'],
+            'Chassis': ['1.3'],
+            'Port': ['1.7'],
+            'Portgroup': ['1.3'],
+            'VolumeConnector': ['1.0'],
+            'VolumeTarget': ['1.0'],
+        }
+    },
     'master': {
         'api': '1.36',
         'rpc': '1.42',