diff --git a/api-quick-start/src/docbkx/api-quick-start-intro.xml b/api-quick-start/src/docbkx/api-quick-start-intro.xml index 14b16276a..5c02a91dd 100644 --- a/api-quick-start/src/docbkx/api-quick-start-intro.xml +++ b/api-quick-start/src/docbkx/api-quick-start-intro.xml @@ -5,8 +5,8 @@ xml:id="Compute_API_Quick_Start" version="5.0"> OpenStack APIs To authenticate access to OpenStack services, you must first - issue an authentication request to the OpenStack Identity - Service to acquire an authentication token. To request an + issue an authentication request to OpenStack Identity + to acquire an authentication token. To request an authentication token, you must supply a payload of credentials in the authentication request. Credentials are usually a combination of your user name and @@ -26,7 +26,7 @@ Authentication and API request workflow Request an authentication token from the Identity - Service endpoint that your cloud administrator gave + endpoint that your cloud administrator gave you. Send a payload of credentials in the request: @@ -113,8 +113,8 @@
Authenticate - For a typical OpenStack deployment that runs the - Identity Service, use a cURL command like the following + For a typical OpenStack deployment that runs + Identity, use a cURL command like the following command to request a token: $ curl -i 'http://127.0.0.1:5000/v2.0/tokens' -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{"auth": {"tenantName": "admin", "passwordCredentials": {"username": "admin", "password": "devstack"}}}' If the request succeeds, you receive a 200 @@ -140,19 +140,19 @@ Date: Wed, 06 Nov 2013 20:06:24 GMT
Send API requests - This section shows how to make some Identity Service and - Compute API calls. For a complete list of Identity Service + This section shows how to make some Identity API and + Compute API calls. For a complete list of Identity API calls, see Identity Service APIs. For a complete list of + >Identity APIs. For a complete list of Compute API calls, see Compute APIs and Extensions. - Use the Identity Service API to request a list of + Use the Identity API to request a list of tenants, as follows: $ curl -i -X GET http://166.78.21.23:35357/v2.0/tenants -H "User-Agent: python-keystoneclient" -H "X-Auth-Token: token" - Use the Identity Service API to request a list of + Use the Identity API to request a list of endpoints, as follows: $ curl -i -X GET http://166.78.21.23:35357/v2.0/endpoints -H "User-Agent: python-keystoneclient" -H "X-Auth-Token: token" diff --git a/api-quick-start/src/docbkx/api-quick-start-onepager.xml b/api-quick-start/src/docbkx/api-quick-start-onepager.xml index dcbdb4970..75f5e80a7 100644 --- a/api-quick-start/src/docbkx/api-quick-start-onepager.xml +++ b/api-quick-start/src/docbkx/api-quick-start-onepager.xml @@ -9,12 +9,12 @@ Although you install each OpenStack service separately, the OpenStack services work together to meet your cloud needs: - Identity Service, Compute, Image Service, Block Storage - Service, Networking, Object Storage, Orchestration, and - Telemetry. With the TryStack OpenStack installation, these services - work together in the background of the installation. - After you authenticate through the Identity Service, you can + Identity, Compute, Image Service, Block Storage, Networking, + Object Storage, Orchestration, and Telemetry. With the TryStack + OpenStack installation, these services work together in the + background of the installation. + After you authenticate through Identity, you can use the other OpenStack APIs to create and manage resources in your OpenStack cloud. You can launch instances from images and assign metadata to instances through the Compute API or the @@ -33,7 +33,8 @@ clients Each OpenStack project provides a command-line client that enables you to access its API through - easy-to-use commands. See . + easy-to-use commands. See . REST clients diff --git a/api-ref/src/docbkx/api-ref-identity.xml b/api-ref/src/docbkx/api-ref-identity.xml index 1253739a1..031c0c77f 100644 --- a/api-ref/src/docbkx/api-ref-identity.xml +++ b/api-ref/src/docbkx/api-ref-identity.xml @@ -8,7 +8,7 @@ version="5.0-extension RackBook-2.0" xml:id="api.openstack.org-identity-v2"> - OpenStack Identity Service APIs and extensions + OpenStack Identity APIs and extensions 2010-2014 diff --git a/api-ref/src/docbkx/bk-api-ref-identity.xml b/api-ref/src/docbkx/bk-api-ref-identity.xml index 40f86b087..91718ca04 100644 --- a/api-ref/src/docbkx/bk-api-ref-identity.xml +++ b/api-ref/src/docbkx/bk-api-ref-identity.xml @@ -20,8 +20,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="api.openstack.org-identity-pdf"> - OpenStack Identity Service API Reference - Identity Service API Reference + OpenStack Identity API Reference + Identity API Reference @@ -35,7 +35,7 @@ 2010-2013 OpenStack Foundation - OpenStack Identity Service + OpenStack Identity diff --git a/api-ref/src/docbkx/ch_compute-v3-ext.xml b/api-ref/src/docbkx/ch_compute-v3-ext.xml index cd0ce3798..23b1ded21 100755 --- a/api-ref/src/docbkx/ch_compute-v3-ext.xml +++ b/api-ref/src/docbkx/ch_compute-v3-ext.xml @@ -20,10 +20,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="compute-ext-v3"> Compute API v3 extensions - Adds capabilities to the core Compute API. Use extensions to - add features, MIME types, actions, states, headers, parameters, - and resources to the core API. Query the Compute API to list - available extensions with a &GET; request to v3/extensions. + Query the Compute API to list + available extensions with a &GET; request to v3/extensions.
Server admin actions Permits administrators to perform actions on a server. diff --git a/api-ref/src/docbkx/ch_identity-admin-v2.xml b/api-ref/src/docbkx/ch_identity-admin-v2.xml index 51bdee062..80188ea99 100644 --- a/api-ref/src/docbkx/ch_identity-admin-v2.xml +++ b/api-ref/src/docbkx/ch_identity-admin-v2.xml @@ -7,8 +7,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="identity-admin-v2" xlink:href="#identity-admin-v2"> - Identity Service admin API v2.0 - Gets an authentication token that permits access to the + Identity admin API v2.0 + Get an authentication token that permits access to the Compute API. - Identity Service API v2.0 extensions - Adds capabilities to the core Identity Service Admin API - v2.0. - Query the Identity Service API to list available extensions + Identity API v2.0 extensions + Query the Identity API to list available extensions with a &GET; request to v2.0/extensions.
HP-IDM-serviceId extended parameter diff --git a/api-ref/src/docbkx/ch_identity-v2.xml b/api-ref/src/docbkx/ch_identity-v2.xml index 1f62cb66b..096d3d1d8 100644 --- a/api-ref/src/docbkx/ch_identity-v2.xml +++ b/api-ref/src/docbkx/ch_identity-v2.xml @@ -7,8 +7,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="identity-v2" xlink:href="#identity-v2"> - Identity Service API v2.0 - Gets an authentication token that permits access to the + Identity API v2.0 + Get an authentication token that permits access to the Compute API. - Identity Service API v3 extensions - Adds capabilities to the core Identity Service Admin API - v3. - Query the Identity Service API to list available extensions + Identity API v3 extensions + Query the Identity API to list available extensions with a &GET; request to v3/extensions.
OS-OAUTH1 extension - Enables users to delegate roles to third-party consumers + Enable users to delegate roles to third-party consumers through the OAuth 1.0a specification. - A user is an Identity Service API user who delegates its + A user is an Identity API user who delegates its roles and who authorizes request tokens. A consumer is a third-party application that uses OAuth to access a protected resource. An OAuth-derived token enables admin @@ -31,7 +29,7 @@ required string that is provided with the corresponding request token in exchange for an access token. An access token is a token that the consumer uses to request - Identity Service API tokens on behalf of the authorizing + Identity API tokens on behalf of the authorizing user instead of using the credentials for the user. Request and access tokens use token keys to identify themselves. For OpenStack purposes, the token key is the @@ -60,11 +58,9 @@ key from the consumer out-of-band. - The consumer uses the access token to request a - Identity Service API token. + The consumer uses the access token to request an + Identity API token. -
diff --git a/api-ref/src/docbkx/ch_identity-v3.xml b/api-ref/src/docbkx/ch_identity-v3.xml index 7ecefea63..fb33c0593 100644 --- a/api-ref/src/docbkx/ch_identity-v3.xml +++ b/api-ref/src/docbkx/ch_identity-v3.xml @@ -7,8 +7,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" xml:id="identity-v3" xlink:href="#identity-v3"> - Identity Service API v3 - Gets an authentication token that permits access to the + Identity API v3 + Get an authentication token that permits access to the Compute API.
Versions @@ -22,7 +22,7 @@
Tokens - Enables service developers to manage tokens. + Manage tokens.
Service catalog - Enables service developers to manage the catalog of + Manage the catalog of services. @@ -47,7 +47,7 @@
Endpoints - Enables service developers to manage endpoints. + Manage endpoints.
Domains - Enables service developers to manage domains. + Manage domains. Domains represent collections of users, groups, and projects. Each is owned by exactly one domain. Users, however, can be associated with multiple projects by @@ -113,7 +113,7 @@
Projects - Enables service developers to manage projects. + Manage projects.
Users - Enables service developers to manage users. + Manage users.
Groups - Enables service developers to manage groups. + Manage groups.
Credentials - Enables service developers to manage credentials. + Manage credentials.
Roles - Enables service developers to manage roles. + Manage roles.
Policies - Enables service developers to manage policies. + Manage policies. Block - Storage Service API + Storage API Compute @@ -19,8 +19,8 @@ extensions - Identity - Service API and extensions + Identity API + and extensions Image Service diff --git a/api-ref/src/docbkx/preface.xml b/api-ref/src/docbkx/preface.xml index 83fb9a83e..244bd8915 100644 --- a/api-ref/src/docbkx/preface.xml +++ b/api-ref/src/docbkx/preface.xml @@ -16,7 +16,7 @@ You must install the packages for each API separately. After you authenticate through the Identity Service + xlink:href="api-ref-identity.html">Identity API, you can use the other APIs and extensions to launch server instances, create images, assign metadata to instances and images, create containers and objects, and diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml index 59e37c9d5..0da679112 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml +++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/service.xml @@ -1,4 +1,5 @@ - - + diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml index b472a826c..14a5d8d7d 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml +++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/services.xml @@ -1,6 +1,8 @@ - - - - + + + diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl index a7e50e4a3..e0b7d9cae 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl +++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl @@ -115,8 +115,8 @@ itemNotFound (404) fault is returned for a token that is not valid. This extension - might decrypt 'X-Subject-Token' header and internally - call the normal validation for the Identity Service, + might decrypt X-Subject-Token header and internally + call the normal validation for Identity, passing in all headers and query parameters. It should therefore support all existing calls on /tokens/{tokenId}, including @@ -154,8 +154,8 @@ itemNotFound (404) fault is returned for a token that is not valid. This extension - might decrypt 'X-Subject-Token' header and internally - call the normal validation for the Identity Service, + might decrypt X-Subject-Token header and internally + call the normal validation for Identity, passing in all headers and query parameters. It should therefore support all existing calls on /tokens/{tokenId}, including diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl index 175c2da2f..02f5344f2 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl +++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl @@ -199,7 +199,7 @@ Gets detailed information about a specified version - of the Identity Service API. + of the Identity API.