diff --git a/doc/source/devref/plugin.spi.rst b/doc/source/devref/plugin.spi.rst index e8fbb678fd..31ee976476 100644 --- a/doc/source/devref/plugin.spi.rst +++ b/doc/source/devref/plugin.spi.rst @@ -346,7 +346,7 @@ below further specifies which fields are filled at which moment. +============================+========+=======================================+ | name | string | Cluster name. | +----------------------------+--------+---------------------------------------+ -| tenant_id | string | OpenStack Tenant id where this | +| project_id | string | OpenStack Project id where this | | | | Cluster is available. | +----------------------------+--------+---------------------------------------+ | plugin_name | string | Plugin name. | diff --git a/doc/source/devref/quickstart.rst b/doc/source/devref/quickstart.rst index 652833d275..b23fbcc392 100644 --- a/doc/source/devref/quickstart.rst +++ b/doc/source/devref/quickstart.rst @@ -24,7 +24,7 @@ OR To use the OpenStack command line tools you should specify environment variables with the configuration details for your OpenStack installation. The following example assumes that the Identity service is -at ``127.0.0.1:5000``, with a user ``admin`` in the ``admin`` tenant +at ``127.0.0.1:5000``, with a user ``admin`` in the ``admin`` project whose password is ``nova``: .. sourcecode:: console diff --git a/doc/source/restapi.rst b/doc/source/restapi.rst index 95976f588f..962ac3e8bc 100644 --- a/doc/source/restapi.rst +++ b/doc/source/restapi.rst @@ -17,8 +17,8 @@ authenticating to the Identity service endpoint. For more information about the Identity service, please see the `keystone project developer documentation `_ -With each request, a user must specify the keystone project (previously tenant) -in the url path, for example: '/v1.1/{tenant_id}/clusters'. Sahara +With each request, a user must specify the keystone project +in the url path, for example: '/v1.1/{project_id}/clusters'. Sahara will perform the requested operation in the specified project using the provided credentials. Therefore, clusters may be created and managed only within projects to which the user has access. @@ -39,13 +39,13 @@ Example: .. sourcecode:: http - GET /v1.1/{tenant_id}/clusters.json + GET /v1.1/{project_id}/clusters.json or .. sourcecode:: http - GET /v1.1/{tenant_id}/clusters + GET /v1.1/{project_id}/clusters Accept: application/json 1.3 Navigation by response @@ -64,7 +64,7 @@ Get 15 clusters after cluster with id=d62ad147-5c10-418c-a21a-3a6597044f29: .. sourcecode:: http - GET /v1.1/{tenant_id}/clusters?limit=15&marker=d62ad147-5c10-418c-a21a-3a6597044f29 + GET /v1.1/{project_id}/clusters?limit=15&marker=d62ad147-5c10-418c-a21a-3a6597044f29 For convenience, response contains markers of previous and following pages which are named 'prev' and 'next' fields. Also there is ``sort_by`` parameter @@ -75,13 +75,13 @@ Sort clusters by name: .. sourcecode:: http - GET /v1.1/{tenant_id}/clusters?sort_by=name + GET /v1.1/{project_id}/clusters?sort_by=name Sort clusters by date of creation in descending order: .. sourcecode:: http - GET /v1.1/{tenant_id}/clusters?sort_by=-created_at + GET /v1.1/{project_id}/clusters?sort_by=-created_at 1.4 Faults diff --git a/doc/source/userdoc/configuration.guide.rst b/doc/source/userdoc/configuration.guide.rst index b8c98063a3..39f50b6464 100644 --- a/doc/source/userdoc/configuration.guide.rst +++ b/doc/source/userdoc/configuration.guide.rst @@ -45,7 +45,7 @@ should point to the admin Identity API endpoint. For example: Specify the ``admin_user``, ``admin_password`` and ``admin_tenant_name``. These parameters must specify an Identity user who has the ``admin`` role -in the given tenant. These credentials allow sahara to authenticate and +in the given project. These credentials allow sahara to authenticate and authorize its users. Next you will configure the default Networking service. If using diff --git a/doc/source/userdoc/dashboard.guide.rst b/doc/source/userdoc/dashboard.guide.rst index d74762bb6e..5668dbb980 100644 --- a/doc/source/userdoc/dashboard.guide.rst +++ b/doc/source/userdoc/dashboard.guide.rst @@ -49,9 +49,9 @@ Local endpoint example: data_processing_local openstack endpoint create --region RegionOne \ - --publicurl http://127.0.0.1:8386/v1.1/%\(tenant_id\)s \ - --adminurl http://127.0.0.1:8386/v1.1/%\(tenant_id\)s \ - --internalurl http://127.0.0.1:8386/v1.1/%\(tenant_id\)s \ + --publicurl http://127.0.0.1:8386/v1.1/%\(project_id\)s \ + --adminurl http://127.0.0.1:8386/v1.1/%\(project_id\)s \ + --internalurl http://127.0.0.1:8386/v1.1/%\(project_id\)s \ data_processing_local .. diff --git a/doc/source/userdoc/features.rst b/doc/source/userdoc/features.rst index 89d81d1488..60a0f2539a 100644 --- a/doc/source/userdoc/features.rst +++ b/doc/source/userdoc/features.rst @@ -235,7 +235,7 @@ security group policy manually. Shared and protected resources support -------------------------------------- -Sahara allows you to create resources that can be shared across tenants and +Sahara allows you to create resources that can be shared across projects and protected from modifications. To provide this feature all sahara objects that can be accessed through @@ -245,17 +245,17 @@ parameters or these parameters can be updated after creation. Both fields are set to ``False`` by default. If some object has its ``is_public`` field set to ``True``, it means that it's -visible not only from the tenant in which it was created, but from any other -tenants too. +visible not only from the project in which it was created, but from any other +projects too. If some object has its ``is_protected`` field set to ``True``, it means that it can not be modified (updated, scaled, canceled or deleted) unless this field is set to ``False``. -Public objects created in one tenant can be used from other tenants (for +Public objects created in one project can be used from other projects (for example, a cluster can be created from a public cluster template which is -created in another tenant), but modification operations are possible only from -the tenant in which object was created. +created in another project), but modification operations are possible only from +the project in which object was created. Data source placeholders support -------------------------------- diff --git a/doc/source/userdoc/hadoop-swift.rst b/doc/source/userdoc/hadoop-swift.rst index cd25ceefd9..c2dff9bb01 100644 --- a/doc/source/userdoc/hadoop-swift.rst +++ b/doc/source/userdoc/hadoop-swift.rst @@ -75,11 +75,11 @@ There are two types of configs here: * ``.auth.url`` - authorization URL * ``.auth.endpoint.prefix`` - prefix for the service url, e.g. ``/AUTH_`` - * ``.tenant`` - project name in V3 terms + * ``.tenant`` - project name * ``.username`` * ``.password`` * ``.domain.name`` - Domains can be used to specify users who are not in - the tenant specified. + the project specified. * ``.domain.id`` - You can also specify domain using id. * ``.trust.id`` - Trusts are optionally used to scope the authentication tokens of the supplied user. diff --git a/doc/source/userdoc/installation.guide.rst b/doc/source/userdoc/installation.guide.rst index a24542ef6e..2e61963376 100644 --- a/doc/source/userdoc/installation.guide.rst +++ b/doc/source/userdoc/installation.guide.rst @@ -198,9 +198,9 @@ installations of sahara. "Sahara Data Processing" data-processing openstack endpoint create --region RegionOne \ - --publicurl http://10.0.0.2:8386/v1.1/%\(tenant_id\)s \ - --adminurl http://10.0.0.2:8386/v1.1/%\(tenant_id\)s \ - --internalurl http://10.0.0.2:8386/v1.1/%\(tenant_id\)s \ + --publicurl http://10.0.0.2:8386/v1.1/%\(project_id\)s \ + --adminurl http://10.0.0.2:8386/v1.1/%\(project_id\)s \ + --internalurl http://10.0.0.2:8386/v1.1/%\(project_id\)s \ data-processing .. note:: @@ -247,12 +247,12 @@ The above configuration values are included in a sample configuration file at ``/plugins/default_templates/template.conf`` The command to install all of the default templates is as follows, where -``$TENANT_ID`` should be a valid tenant id and the above configuration values +``$PROJECT_ID`` should be a valid project id and the above configuration values have been set in ``myconfig``: .. sourcecode:: console - $ sahara-templates --config-file /etc/sahara/sahara.conf --config-file myconfig update -t $TENANT_ID + $ sahara-templates --config-file /etc/sahara/sahara.conf --config-file myconfig update -t $PROJECT_ID Help is available from the ``sahara-templates`` command: diff --git a/doc/source/userdoc/sahara_on_ironic.rst b/doc/source/userdoc/sahara_on_ironic.rst index f966438e71..60154b3085 100644 --- a/doc/source/userdoc/sahara_on_ironic.rst +++ b/doc/source/userdoc/sahara_on_ironic.rst @@ -114,7 +114,7 @@ Known limitations: * When booting a nova instance with a bare metal flavor, the user can not provide a pre-created neutron port to ``nova boot`` command. `LP1544195 `_ -* Nodes are not isolated by tenants. +* Nodes are not isolated by projects. * VM to Bare Metal network routing is not allowed. * The user has to specify the count of ironic nodes before Devstack deploys an Openstack. diff --git a/doc/source/userdoc/upgrade.guide.rst b/doc/source/userdoc/upgrade.guide.rst index 98f77ff5fc..51e6d1a890 100644 --- a/doc/source/userdoc/upgrade.guide.rst +++ b/doc/source/userdoc/upgrade.guide.rst @@ -23,15 +23,15 @@ update your configuration file you should replace the following parameters from the ``[DEFAULT]`` section with the new parameters in the ``[keystone_authtoken]`` section: -+----------------------+--------------------+ -| Old parameter name | New parameter name | -+======================+====================+ -| os_admin_username | admin_user | -+----------------------+--------------------+ -| os_admin_password | admin_password | -+----------------------+--------------------+ -| os_admin_tenant_name | admin_tenant_name | -+----------------------+--------------------+ ++-----------------------+--------------------+ +| Old parameter name | New parameter name | ++=======================+====================+ +| os_admin_username | admin_user | ++-----------------------+--------------------+ +| os_admin_password | admin_password | ++-----------------------+--------------------+ +| os_admin_tenant_name | admin_tenant_name | ++-----------------------+--------------------+ Additionally, the parameters ``os_auth_protocol``, ``os_auth_host``, and ``os_auth_port`` have been combined to create the ``auth_uri``