From 347a3258338fdefbe6b63ffa32956fdff2de449e Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Wed, 10 Dec 2014 15:39:37 +0200 Subject: [PATCH] Replace 'tenants' for 'projects' in documentation Partially implements: blueprint replace-concept-of-tenants-for-projects Change-Id: I54f36c5a19488c4af5dfa67550b3d822922b4bb9 --- docs/src/docbkx/ck-devguide.xml | 4 ++-- docs/src/docbkx/ck-gettingstarted.xml | 8 ++++---- docs/src/wadl/Barbican.wadl | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/src/docbkx/ck-devguide.xml b/docs/src/docbkx/ck-devguide.xml index 7ed5e4731..93e20af67 100644 --- a/docs/src/docbkx/ck-devguide.xml +++ b/docs/src/docbkx/ck-devguide.xml @@ -150,9 +150,9 @@ token, you must supply a payload of credentials in the authentication request. Credentials are usually a combination of your user name - and password, and optionally, the name or ID of the tenant in + and password, and optionally, the name or ID of the project in which your cloud runs. Ask your cloud administrator for your - user name, password, and tenant so that you can generate + user name, password, and project so that you can generate authentication tokens. When you send API requests, you include the token in the X-Auth-Token HTTP header. If you access diff --git a/docs/src/docbkx/ck-gettingstarted.xml b/docs/src/docbkx/ck-gettingstarted.xml index 893fb5aba..1c4c5cce8 100644 --- a/docs/src/docbkx/ck-gettingstarted.xml +++ b/docs/src/docbkx/ck-gettingstarted.xml @@ -347,8 +347,8 @@ authentication token, you must supply a payload of credentials in the authentication request. Credentials are usually a combination of your user name and password, and optionally, - the name or ID of the tenant in which your cloud runs. Ask your cloud administrator for - your user name, password, and tenant so that you can generate authentication tokens. + the name or ID of the project in which your cloud runs. Ask your cloud administrator for + your user name, password, and project so that you can generate authentication tokens. When you send API requests, you include the token in the X-Auth-Token header. If you access multiple OpenStack services, you must get a token for each service. A token @@ -641,7 +641,7 @@
Retrieving a list of stored secrets You can retrieve a list of secrets that are - associated with a given tenant by typing the following + associated with a given project by typing the following command: curl -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Project-Id:12345' https://endpointURL/v1/secrets @@ -701,7 +701,7 @@ Retrieving a list of orders You can use a single GET request to retrieve metadata for multiple orders for a given - tenant. To do so, type the following command: + project. To do so, type the following command: curl -H 'Accept: application/json' -H 'X-Project-Id:12345' https://endpointURL/v1/orders diff --git a/docs/src/wadl/Barbican.wadl b/docs/src/wadl/Barbican.wadl index 7b2925f3b..4b0530538 100644 --- a/docs/src/wadl/Barbican.wadl +++ b/docs/src/wadl/Barbican.wadl @@ -23,7 +23,7 @@ - This parameter specifies the tenant ID of the client + This parameter specifies the project ID of the client subscribing to the Barbican service @@ -68,8 +68,8 @@ - This method retrieves all secrets for a given tenant. - This method lists all the secrets for a tenant. + This method retrieves all secrets for a given project. + This method lists all the secrets for a project. @@ -81,7 +81,7 @@ This status code is returned when the secrets have been successfully retrieved for the - tenant. + project. @@ -306,7 +306,7 @@ The following values are supported: This error code is returned when the supplied UUID doesn't match the secret in the - datastore for the specified tenant. + datastore for the specified project. This error code is returned when no @@ -339,8 +339,8 @@ The following values are supported: - This method retrieves all orders for a given tenant. - This method lists all orders for a specified tenant. Performing a GET on the secrets resource with no UUID retrieves a batch of the most recent orders per the requesting tenant. + This method retrieves all orders for a given project. + This method lists all orders for a specified project. Performing a GET on the secrets resource with no UUID retrieves a batch of the most recent orders per the requesting project. The retrieved list of orders is ordered by oldest to newest created date.