Move OS-INHERIT api-ref from extensions to core

Move inheritance API-ref to main Identity API-ref [1]. The docs need to
be updated, though. I think it's better to move them first, then update to
match keystone-specs docs.

[1] Ia838dff1863b1b77472079b32783ae31557b1ef5

Change-Id: I6a6a59bba9c15ac7678e0b20d248dfb4c03881c7

api-ref/source/v3-ext/index.rst

@@ -7,7 +7,6 @@
 This page describes these Identity API v3 extensions:
 
 * `OS-ENDPOINT-POLICY API`_
-* `OS-INHERIT API`_
 * `OS-OAUTH1 API`_
 * `OS-TRUST API`_
 * `OS-REVOKE API`_
@@ -15,7 +14,6 @@ This page describes these Identity API v3 extensions:
 .. rest_expand_all::
 
 .. include:: endpoint-policy.inc
-.. include:: inherit.inc
 .. include:: oauth.inc
 .. include:: trust.inc
 .. include:: revoke.inc

api-ref/source/v3-ext/samples/OS-INHERIT/role-assignments-effective-list-response.json

@@ -1,42 +0,0 @@
-{
-    "role_assignments": [
-        {
-            "links": {
-                "assignment": "http://identity:35357/v3/OS-INHERIT/domains/12131/users/41516/roles/91011/inherited_to_projects"
-            },
-            "role": {
-                "id": "91011"
-            },
-            "scope": {
-                "project": {
-                    "id": "1234"
-                }
-            },
-            "user": {
-                "id": "41516"
-            }
-        },
-        {
-            "links": {
-                "assignment": "http://identity:35357/v3/projects/1234/groups/5678/roles/91011",
-                "membership": "http://identity:35357/v3/groups/5678/users/41516"
-            },
-            "role": {
-                "id": "91011"
-            },
-            "scope": {
-                "project": {
-                    "id": "1234"
-                }
-            },
-            "user": {
-                "id": "41516"
-            }
-        }
-    ],
-    "links": {
-        "self": "http://identity:35357/v3/role_assignments?effective",
-        "previous": null,
-        "next": null
-    }
-}

api-ref/source/v3-ext/samples/OS-INHERIT/role-assignments-list-response.json

@@ -1,42 +0,0 @@
-{
-    "role_assignments": [
-        {
-            "links": {
-                "assignment": "http://identity:35357/v3/OS-INHERIT/domains/1234/users/5678/roles/91011/inherited_to_projects"
-            },
-            "role": {
-                "id": "91011"
-            },
-            "scope": {
-                "domain": {
-                    "id": "1234"
-                },
-                "OS-INHERIT:inherited_to": "projects"
-            },
-            "user": {
-                "id": "5678"
-            }
-        },
-        {
-            "group": {
-                "id": "5678"
-            },
-            "links": {
-                "assignment": "http://identity:35357/v3/projects/1234/groups/5678/roles/91011"
-            },
-            "role": {
-                "id": "91011"
-            },
-            "scope": {
-                "project": {
-                    "id": "1234"
-                }
-            }
-        }
-    ],
-    "links": {
-        "self": "http://identity:35357/v3/role_assignments",
-        "previous": null,
-        "next": null
-    }
-}

api-ref/source/v3/index.rst

@@ -36,6 +36,7 @@ This page lists the Identity API operations in the following order:
 * `Roles`_
 * `Service catalog and endpoints`_
 * `Users`_
+* `OS-INHERIT API`_
 
 .. rest_expand_all::
 
@@ -44,6 +45,7 @@ This page lists the Identity API operations in the following order:
 .. include:: domains.inc
 .. include:: domains-config-v3.inc
 .. include:: groups.inc
+.. include:: inherit.inc
 .. include:: policies.inc
 .. include:: projects.inc
 .. include:: regions-v3.inc

api-ref/source/v3/inherit.inc

@@ -282,7 +282,7 @@ Request
 Response Example
 ----------------
 
-.. literalinclude:: samples/OS-INHERIT/group-roles-domain-list-response.json
+.. literalinclude:: samples/admin/group-roles-domain-list-response.json
    :language: javascript
 
 
@@ -351,7 +351,7 @@ Error response codes: 413,405,404,403,401,400,503
 Response Example
 ----------------
 
-.. literalinclude:: samples/OS-INHERIT/role-assignments-effective-list-response.json
+.. literalinclude:: samples/admin/role-assignments-effective-list-response.json
    :language: javascript
 
 
@@ -375,7 +375,7 @@ Request
 Response Example
 ----------------
 
-.. literalinclude:: samples/OS-INHERIT/user-roles-domain-list-response.json
+.. literalinclude:: samples/admin/user-roles-domain-list-response.json
    :language: javascript
 
 
@@ -402,7 +402,7 @@ Request
 Response Example
 ----------------
 
-.. literalinclude:: samples/OS-INHERIT/group-roles-list-response.json
+.. literalinclude:: samples/admin/group-roles-list-response.json
    :language: javascript
 
 
@@ -429,5 +429,5 @@ Request
 Response Example
 ----------------
 
-.. literalinclude:: samples/OS-INHERIT/user-roles-list-response.json
+.. literalinclude:: samples/admin/user-roles-list-response.json
    :language: javascript