Merge "Mark the domain config via API as stable"

doc/source/configuration.rst

@@ -225,6 +225,12 @@ specifying the domain name:
     domain-specific backend, perhaps for storing service users in a
     predominantly LDAP installation.
 
+.. NOTE::
+
+    Keystone has deprecated the ``keystone-manage domain_config_upload``
+    option. The keystone team recommends setting domain config options via the
+    API instead.
+
 Due to the need for user and group IDs to be unique across an OpenStack
 installation and for Keystone to be able to deduce which domain and backend to
 use from just a user or group ID, it dynamically builds a persistent identity

keystone/cmd/cli.py

@@ -812,6 +812,11 @@ class DomainConfigUpload(BaseApp):
 
     @staticmethod
     def main():
+        versionutils.report_deprecated_feature(
+            LOG,
+            _LW("keystone-manage domain_config_upload is deprecated as of "
+                "Newton in favor of setting domain config options via the API "
+                "and may be removed in 'P' release."))
         dcu = DomainConfigUploadFiles()
         status = dcu.run()
         if status is not None:

keystone/resource/routers.py

@@ -53,7 +53,7 @@ class Routers(wsgi.RoutersBase):
             patch_action='update_domain_config_only',
             delete_action='delete_domain_config',
             rel=json_home.build_v3_resource_relation('domain_config'),
-            status=json_home.Status.EXPERIMENTAL,
+            status=json_home.Status.STABLE,
             path_vars={
                 'domain_id': json_home.Parameters.DOMAIN_ID
             })
@@ -67,7 +67,7 @@ class Routers(wsgi.RoutersBase):
             patch_action='update_domain_config_group',
             delete_action='delete_domain_config',
             rel=json_home.build_v3_resource_relation('domain_config_group'),
-            status=json_home.Status.EXPERIMENTAL,
+            status=json_home.Status.STABLE,
             path_vars={
                 'domain_id': json_home.Parameters.DOMAIN_ID,
                 'group': config_group_param
@@ -80,7 +80,7 @@ class Routers(wsgi.RoutersBase):
             patch_action='update_domain_config',
             delete_action='delete_domain_config',
             rel=json_home.build_v3_resource_relation('domain_config_option'),
-            status=json_home.Status.EXPERIMENTAL,
+            status=json_home.Status.STABLE,
             path_vars={
                 'domain_id': json_home.Parameters.DOMAIN_ID,
                 'group': config_group_param,
@@ -93,7 +93,7 @@ class Routers(wsgi.RoutersBase):
             path='/domains/config/default',
             get_action='get_domain_config_default',
             rel=json_home.build_v3_resource_relation('domain_config_default'),
-            status=json_home.Status.EXPERIMENTAL)
+            status=json_home.Status.STABLE)
 
         self._add_resource(
             mapper, config_controller,
@@ -101,7 +101,7 @@ class Routers(wsgi.RoutersBase):
             get_action='get_domain_config_default',
             rel=json_home.build_v3_resource_relation(
                 'domain_config_default_group'),
-            status=json_home.Status.EXPERIMENTAL,
+            status=json_home.Status.STABLE,
             path_vars={
                 'group': config_group_param
             })
@@ -112,7 +112,7 @@ class Routers(wsgi.RoutersBase):
             get_action='get_domain_config_default',
             rel=json_home.build_v3_resource_relation(
                 'domain_config_default_option'),
-            status=json_home.Status.EXPERIMENTAL,
+            status=json_home.Status.STABLE,
             path_vars={
                 'group': config_group_param,
                 'option': json_home.build_v3_parameter_relation(

keystone/tests/unit/test_versions.py

@@ -583,37 +583,31 @@ V3_JSON_HOME_RESOURCES = {
         'href-template':
         '/domains/{domain_id}/config',
         'href-vars': {
-            'domain_id': json_home.Parameters.DOMAIN_ID},
+            'domain_id': json_home.Parameters.DOMAIN_ID}},
-        'hints': {'status': 'experimental'}},
     json_home.build_v3_resource_relation('domain_config_group'): {
         'href-template':
         '/domains/{domain_id}/config/{group}',
         'href-vars': {
             'domain_id': json_home.Parameters.DOMAIN_ID,
-            'group': json_home.build_v3_parameter_relation('config_group')},
+            'group': json_home.build_v3_parameter_relation('config_group')}},
-        'hints': {'status': 'experimental'}},
     json_home.build_v3_resource_relation('domain_config_option'): {
         'href-template':
         '/domains/{domain_id}/config/{group}/{option}',
         'href-vars': {
             'domain_id': json_home.Parameters.DOMAIN_ID,
             'group': json_home.build_v3_parameter_relation('config_group'),
-            'option': json_home.build_v3_parameter_relation('config_option')},
+            'option': json_home.build_v3_parameter_relation('config_option')}},
-        'hints': {'status': 'experimental'}},
     json_home.build_v3_resource_relation('domain_config_default'): {
-        'href': '/domains/config/default',
+        'href': '/domains/config/default'},
-        'hints': {'status': 'experimental'}},
     json_home.build_v3_resource_relation('domain_config_default_group'): {
         'href-template': '/domains/config/{group}/default',
         'href-vars': {
-            'group': json_home.build_v3_parameter_relation('config_group')},
+            'group': json_home.build_v3_parameter_relation('config_group')}},
-        'hints': {'status': 'experimental'}},
     json_home.build_v3_resource_relation('domain_config_default_option'): {
         'href-template': '/domains/config/{group}/{option}/default',
         'href-vars': {
             'group': json_home.build_v3_parameter_relation('config_group'),
-            'option': json_home.build_v3_parameter_relation('config_option')},
+            'option': json_home.build_v3_parameter_relation('config_option')}}
-        'hints': {'status': 'experimental'}},
 }
 
 

releasenotes/notes/bp-domain-config-as-stable-716ca5ab33c0cc42.yaml

@@ -0,0 +1,12 @@
+---
+features:
+  - >
+    [`blueprint domain-config-as-stable <https://blueprints.launchpad.net/keystone/+spec/domain-config-as-stable>`_]
+    The domain config via API is now marked as stable.
+deprecations:
+  - >
+    [`blueprint domain-config-as-stable  <https://blueprints.launchpad.net/keystone/+spec/domain-config-as-stable>`_]
+    Deprecated ``keystone-manage domain_config_upload``.  The keystone team recommends
+    setting domain config options via the API instead.  The ``domain_config_upload``
+    command line option may be removed in the 'P' release.
+