From 84b1a2ffed97577b2db0facd127c3b3abafbc46f Mon Sep 17 00:00:00 2001 From: qiaomin Date: Mon, 29 Aug 2016 14:23:52 +0000 Subject: [PATCH] [admin-guide] Use "project" to replace "tenant" term in admin-guide This patch use "project" to replace "tenant" term in admin-guide for cleanup. Change-Id: I879a6c1ecfbbed2d8db0a02457d06375a268b176 Partial-Bug: #1475005 --- .../source/baremetal-multitenancy.rst | 8 +-- .../blockstorage-image-volume-cache.rst | 4 +- .../blockstorage-volume-backed-image.rst | 8 +-- .../source/blockstorage-volume-backups.rst | 2 +- doc/admin-guide/source/cli-cinder-quotas.rst | 6 +- doc/admin-guide/source/cli-manage-flavors.rst | 4 +- .../cli-manage-projects-users-and-roles.rst | 6 +- .../source/cli-networking-advanced-quotas.rst | 61 ++++++++++--------- .../cli-nova-manage-projects-security.rst | 8 +-- .../source/cli-set-compute-quotas.rst | 50 +++++++-------- doc/admin-guide/source/cli-set-quotas.rst | 12 ++-- doc/admin-guide/source/compute-flavors.rst | 2 +- .../source/compute-manage-the-cloud.rst | 2 +- .../source/compute-networking-nova.rst | 22 +++---- .../source/dashboard-set-quotas.rst | 10 +-- .../source/dashboard-view-cloud-resources.rst | 2 +- .../source/identity-auth-token-middleware.rst | 4 +- doc/admin-guide/source/identity-concepts.rst | 26 ++++---- ...tone-integrate-assignment-backend-ldap.rst | 2 +- ...ystone-integrate-identity-backend-ldap.rst | 2 +- .../source/keystone-use-trusts.rst | 4 +- .../source/networking-adv-features.rst | 26 ++++---- doc/admin-guide/source/networking-arch.rst | 8 +-- doc/admin-guide/source/networking-auth.rst | 12 ++-- .../source/networking-config-agents.rst | 2 +- .../source/networking-config-identity.rst | 14 ++--- .../source/networking-config-plugins.rst | 2 +- .../source/networking-introduction.rst | 10 +-- doc/admin-guide/source/networking-use.rst | 18 +++--- ...tstorage-tenant-specific-image-storage.rst | 18 +++--- .../source/shared-file-systems-crud-share.rst | 6 +- .../shared-file-systems-key-concepts.rst | 4 +- .../shared-file-systems-network-plugins.rst | 4 +- .../source/shared-file-systems-quotas.rst | 24 ++++---- .../shared-file-systems-security-services.rst | 4 +- .../shared-file-systems-share-networks.rst | 2 +- .../shared-file-systems-troubleshoot.rst | 2 +- .../source/shared-file-systems.rst | 2 +- doc/admin-guide/source/telemetry-alarms.rst | 4 +- .../source/telemetry-data-retrieval.rst | 4 +- .../source/telemetry-system-architecture.rst | 6 +- 41 files changed, 209 insertions(+), 208 deletions(-) diff --git a/doc/admin-guide/source/baremetal-multitenancy.rst b/doc/admin-guide/source/baremetal-multitenancy.rst index 904f5e90be..61f7ad07a2 100644 --- a/doc/admin-guide/source/baremetal-multitenancy.rst +++ b/doc/admin-guide/source/baremetal-multitenancy.rst @@ -4,15 +4,15 @@ Use multitenancy with Bare Metal service ======================================== -Multitenancy allows creating a dedicated tenant network that extends the +Multitenancy allows creating a dedicated project network that extends the current Bare Metal (ironic) service capabilities of providing ``flat`` networks. Multitenancy works in conjunction with Networking (neutron) -service to allow provisioning of a bare metal server onto the tenant network. -Therefore, multiple tenants can get isolated instances after deployment. +service to allow provisioning of a bare metal server onto the project network. +Therefore, multiple projects can get isolated instances after deployment. Bare Metal service provides the ``local_link_connection`` information to the Networking service ML2 driver. The ML2 driver uses that information to plug the -specified port to the tenant network. +specified port to the project network. .. list-table:: ``local_link_connection`` fields :header-rows: 1 diff --git a/doc/admin-guide/source/blockstorage-image-volume-cache.rst b/doc/admin-guide/source/blockstorage-image-volume-cache.rst index 2fa4accae9..589ccd9231 100644 --- a/doc/admin-guide/source/blockstorage-image-volume-cache.rst +++ b/doc/admin-guide/source/blockstorage-image-volume-cache.rst @@ -22,7 +22,7 @@ Configure the Internal Tenant ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Image-Volume cache requires that the Internal Tenant be configured for -the Block Storage services. This tenant will own the cached image-volumes so +the Block Storage services. This project will own the cached image-volumes so they can be managed like normal users including tools like volume quotas. This protects normal users from having to see the cached image-volumes, but does not make them globally hidden. @@ -46,7 +46,7 @@ An example ``cinder.conf`` configuration file: The actual user and project that are configured for the Internal Tenant do not require any special privileges. They can be the Block Storage service - tenant or can be any normal project and user. + project or can be any normal project and user. Configure the Image-Volume cache ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/admin-guide/source/blockstorage-volume-backed-image.rst b/doc/admin-guide/source/blockstorage-volume-backed-image.rst index 248fbd43e5..7a4f814a3a 100644 --- a/doc/admin-guide/source/blockstorage-volume-backed-image.rst +++ b/doc/admin-guide/source/blockstorage-volume-backed-image.rst @@ -11,7 +11,7 @@ such as file and swift, creating a volume from a Volume-backed image performs better when the block storage driver supports efficient volume cloning. If the image is set to public in the Image service, the volume data can be -shared among tenants. +shared among projects. Configure the Volume-backed image ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -50,15 +50,15 @@ each back-end section of the ``cinder.conf`` file: image_upload_use_cinder_backend = True By default, the :command:`openstack image create --volume ` command -creates the Image-Volume in the current tenant. To store the Image-Volume into -the internal tenant, set the following options in each back-end section of the +creates the Image-Volume in the current project. To store the Image-Volume into +the internal project, set the following options in each back-end section of the ``cinder.conf`` file: .. code-block:: ini image_upload_use_internal_tenant = True -To make the Image-Volume in the internal tenant accessible from the Image +To make the Image-Volume in the internal project accessible from the Image service, set the following options in the ``glance_store`` section of the ``glance-api.conf`` file: diff --git a/doc/admin-guide/source/blockstorage-volume-backups.rst b/doc/admin-guide/source/blockstorage-volume-backups.rst index ad3aa47d5a..ba51d934fc 100644 --- a/doc/admin-guide/source/blockstorage-volume-backups.rst +++ b/doc/admin-guide/source/blockstorage-volume-backups.rst @@ -87,7 +87,7 @@ command. Optional arguments to clarify the status of your backups include: running :option:`--name`, :option:`--status`, and :option:`--volume-id` to filter through backups by the specified name, status, or volume-id. Search with :option:`--all-tenants` for details of the -tenants associated with the listed backups. +projects associated with the listed backups. Because volume backups are dependent on the Block Storage database, you must also back up your Block Storage database regularly to ensure data recovery. diff --git a/doc/admin-guide/source/cli-cinder-quotas.rst b/doc/admin-guide/source/cli-cinder-quotas.rst index db521d13dc..87cec3344e 100644 --- a/doc/admin-guide/source/cli-cinder-quotas.rst +++ b/doc/admin-guide/source/cli-cinder-quotas.rst @@ -29,7 +29,7 @@ Administrative users can view Block Storage service quotas. $ project_id=$(openstack project show -f value -c id PROJECT_NAME) -#. List the default quotas for a project (tenant): +#. List the default quotas for a project: .. code-block:: console @@ -48,7 +48,7 @@ Administrative users can view Block Storage service quotas. | volumes | 10 | +-----------+-------+ -#. View Block Storage service quotas for a project (tenant): +#. View Block Storage service quotas for a project: .. code-block:: console @@ -99,7 +99,7 @@ service quotas. `_ in OpenStack Configuration Reference. -#. To update Block Storage service quotas for an existing project (tenant): +#. To update Block Storage service quotas for an existing project .. code-block:: console diff --git a/doc/admin-guide/source/cli-manage-flavors.rst b/doc/admin-guide/source/cli-manage-flavors.rst index c017170b4b..89bb40028f 100644 --- a/doc/admin-guide/source/cli-manage-flavors.rst +++ b/doc/admin-guide/source/cli-manage-flavors.rst @@ -119,7 +119,7 @@ Create a flavor $ openstack flavor create --is-public true m1.extra_tiny auto 256 0 1 --rxtx-factor .1 #. If an individual user or group of users needs a custom - flavor that you do not want other tenants to have access to, + flavor that you do not want other projects to have access to, you can change the flavor's access to make it a private flavor. See `Private Flavors in the OpenStack Operations Guide `_. @@ -132,7 +132,7 @@ Create a flavor #. After you create a flavor, assign it to a project by specifying the flavor name or ID and - the tenant ID: + the project ID: .. code-block:: console diff --git a/doc/admin-guide/source/cli-manage-projects-users-and-roles.rst b/doc/admin-guide/source/cli-manage-projects-users-and-roles.rst index 7bcc193311..86ad821372 100644 --- a/doc/admin-guide/source/cli-manage-projects-users-and-roles.rst +++ b/doc/admin-guide/source/cli-manage-projects-users-and-roles.rst @@ -4,7 +4,7 @@ Manage projects, users, and roles As an administrator, you manage projects, users, and roles. Projects are organizational units in the cloud to which -you can assign users. Projects are also known as *tenants* or +you can assign users. Projects are also known as *projects* or *accounts*. Users can be members of one or more projects. Roles define which actions users can perform. You assign roles to user-project pairs. @@ -146,8 +146,8 @@ Create a user ^^^^^^^^^^^^^ To create a user, you must specify a name. Optionally, you can -specify a tenant ID, password, and email address. It is recommended -that you include the tenant ID and password because the user cannot +specify a project ID, password, and email address. It is recommended +that you include the project ID and password because the user cannot log in to the dashboard without this information. Create the ``new-user`` user: diff --git a/doc/admin-guide/source/cli-networking-advanced-quotas.rst b/doc/admin-guide/source/cli-networking-advanced-quotas.rst index 148a2c22cc..e46da9276e 100644 --- a/doc/admin-guide/source/cli-networking-advanced-quotas.rst +++ b/doc/admin-guide/source/cli-networking-advanced-quotas.rst @@ -3,7 +3,7 @@ Manage Networking service quotas ================================ A quota limits the number of available resources. A default -quota might be enforced for all tenants. When you try to create +quota might be enforced for all projects. When you try to create more resources than the quota allows, an error occurs: .. code-block:: ini @@ -11,15 +11,15 @@ more resources than the quota allows, an error occurs: $ neutron net-create test_net Quota exceeded for resources: ['network'] -Per-tenant quota configuration is also supported by the quota +Per-project quota configuration is also supported by the quota extension API. See :ref:`cfg_quotas_per_tenant` for details. Basic quota configuration ~~~~~~~~~~~~~~~~~~~~~~~~~ -In the Networking default quota mechanism, all tenants have +In the Networking default quota mechanism, all projects have the same quota values, such as the number of resources that a -tenant can create. +project can create. The quota value is defined in the OpenStack Networking ``/etc/neutron/neutron.conf`` configuration file. This example shows the @@ -69,33 +69,33 @@ each security group. Add these lines to the .. _cfg_quotas_per_tenant: -Configure per-tenant quotas -~~~~~~~~~~~~~~~~~~~~~~~~~~~ -OpenStack Networking also supports per-tenant quota limit by +Configure per-project quotas +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +OpenStack Networking also supports per-project quota limit by quota extension API. -Use these commands to manage per-tenant quotas: +Use these commands to manage per-project quotas: neutron quota-delete - Delete defined quotas for a specified tenant + Delete defined quotas for a specified project neutron quota-list - Lists defined quotas for all tenants + Lists defined quotas for all projects neutron quota-show - Shows quotas for a specified tenant + Shows quotas for a specified project neutron quota-default-show Show default quotas for a specified tenant neutron quota-update - Updates quotas for a specified tenant + Updates quotas for a specified project Only users with the ``admin`` role can change a quota value. By default, -the default set of quotas are enforced for all tenants, so no +the default set of quotas are enforced for all projects, so no :command:`quota-create` command exists. -#. Configure Networking to show per-tenant quotas +#. Configure Networking to show per-project quotas Set the ``quota_driver`` option in the ``/etc/neutron/neutron.conf`` file. @@ -114,7 +114,7 @@ the default set of quotas are enforced for all tenants, so no $ neutron ext-list -c alias -c name The command shows the ``quotas`` extension, which provides - per-tenant quota management support. + per-project quota management support. .. code-block:: console @@ -152,17 +152,18 @@ the default set of quotas are enforced for all tenants, so no .. note:: - Only some plug-ins support per-tenant quotas. + Only some plug-ins support per-project quotas. Specifically, Open vSwitch, Linux Bridge, and VMware NSX support them, but new versions of other plug-ins might bring additional functionality. See the documentation for each plug-in. -#. List tenants who have per-tenant quota support. +#. List projects who have per-project quota support. - The :command:`neutron quota-list` command lists tenants for which the - per-tenant quota is enabled. The command does not list tenants with default - quota support. You must be an administrative user to run this command: + The :command:`neutron quota-list` command lists projects for which the + per-project quota is enabled. The command does not list projects with + default quota support. You must be an administrative user to run this + command: .. code-block:: console @@ -174,13 +175,13 @@ the default set of quotas are enforced for all tenants, so no | 25 | 10 | 30 | 10 | 10 | bff5c9455ee24231b5bc713c1b96d422 | +------------+---------+------+--------+--------+----------------------------------+ -#. Show per-tenant quota values. +#. Show per-project quota values. The :command:`neutron quota-show` command reports the current - set of quota limits for the specified tenant. + set of quota limits for the specified project. Non-administrative users can run this command without the - :option:`--tenant_id` parameter. If per-tenant quota limits are - not enabled for the tenant, the command shows the default + :option:`--tenant_id` parameter. If per-project quota limits are + not enabled for the project, the command shows the default set of quotas. .. code-block:: console @@ -212,10 +213,10 @@ the default set of quotas are enforced for all tenants, so no | subnet | 5 | +------------+-------+ -#. Update quota values for a specified tenant. +#. Update quota values for a specified project. Use the :command:`neutron quota-update` command to - update a quota for a specified tenant. + update a quota for a specified project. .. code-block:: console @@ -251,7 +252,7 @@ the default set of quotas are enforced for all tenants, so no after the ``--`` directive. This example updates the limit of the number of floating - IPs for the specified tenant. + IPs for the specified project. .. code-block:: console @@ -284,9 +285,9 @@ the default set of quotas are enforced for all tenants, so no | subnet | 3 | +------------+-------+ -#. Delete per-tenant quota values. +#. Delete per-project quota values. - To clear per-tenant quota limits, use the + To clear per-project quota limits, use the :command:`neutron quota-delete` command. .. code-block:: console @@ -295,7 +296,7 @@ the default set of quotas are enforced for all tenants, so no Deleted quota: 6f88036c45344d9999a1f971e4882723 After you run this command, you can see that quota - values for the tenant are reset to the default values. + values for the project are reset to the default values. .. code-block:: console diff --git a/doc/admin-guide/source/cli-nova-manage-projects-security.rst b/doc/admin-guide/source/cli-nova-manage-projects-security.rst index fe6dc85600..6fb7120acf 100644 --- a/doc/admin-guide/source/cli-nova-manage-projects-security.rst +++ b/doc/admin-guide/source/cli-nova-manage-projects-security.rst @@ -38,7 +38,7 @@ List and view current security groups From the command-line you can get a list of security groups for the project, using the :command:`nova` command: -#. Ensure your system variables are set for the user and tenant for +#. Ensure your system variables are set for the user and project for which you are checking security group rules. For example: .. code-block:: console @@ -92,7 +92,7 @@ that use it where the longer description field often does not. For example, seeing that an instance is using security group "http" is much easier to understand than "bobs\_group" or "secgrp1". -#. Ensure your system variables are set for the user and tenant for +#. Ensure your system variables are set for the user and project for which you are creating security group rules. #. Add the new security group, as follows: @@ -162,7 +162,7 @@ easier to understand than "bobs\_group" or "secgrp1". Delete a security group ~~~~~~~~~~~~~~~~~~~~~~~ -#. Ensure your system variables are set for the user and tenant for +#. Ensure your system variables are set for the user and project for which you are deleting a security group. #. Delete the new security group, as follows: @@ -186,7 +186,7 @@ all the user's other Instances using the specified Source Group are selected dynamically. This alleviates the need for individual rules to allow each new member of the cluster. -#. Make sure to set the system variables for the user and tenant for +#. Make sure to set the system variables for the user and project for which you are creating a security group rule. #. Add a source group, as follows: diff --git a/doc/admin-guide/source/cli-set-compute-quotas.rst b/doc/admin-guide/source/cli-set-compute-quotas.rst index 1782424a07..558582ced4 100644 --- a/doc/admin-guide/source/cli-set-compute-quotas.rst +++ b/doc/admin-guide/source/cli-set-compute-quotas.rst @@ -4,8 +4,8 @@ Manage Compute service quotas As an administrative user, you can use the :command:`nova quota-*` commands, which are provided by the ``python-novaclient`` -package, to update the Compute service quotas for a specific tenant or -tenant user, as well as update the quota defaults for a new tenant. +package, to update the Compute service quotas for a specific project or +project user, as well as update the quota defaults for a new project. **Compute quota descriptions** @@ -18,7 +18,7 @@ tenant user, as well as update the quota defaults for a new tenant. * - cores - Number of instance cores (VCPUs) allowed per project. * - fixed-ips - - Number of fixed IP addresses allowed per tenant. This number + - Number of fixed IP addresses allowed per project. This number must be equal to or greater than the number of allowed instances. * - floating-ips @@ -46,12 +46,12 @@ tenant user, as well as update the quota defaults for a new tenant. * - server-group-members - Number of servers per server group. -View and update Compute quotas for a tenant (project) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +View and update Compute quotas for a project (project) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To view and update default quota values --------------------------------------- -#. List all default quotas for all tenants: +#. List all default quotas for all projects: .. code-block:: console @@ -81,7 +81,7 @@ To view and update default quota values | server_group_members | 10 | +-----------------------------+-------+ -#. Update a default value for a new tenant. +#. Update a default value for a new project. .. code-block:: console @@ -93,16 +93,16 @@ To view and update default quota values $ nova quota-class-update --instances 15 default -To view quota values for an existing tenant (project) ------------------------------------------------------ +To view quota values for an existing project +-------------------------------------------- -#. Place the tenant ID in a usable variable. +#. Place the project ID in a usable variable. .. code-block:: console $ tenant=$(openstack project show -f value -c id TENANT_NAME) -#. List the currently set quota values for a tenant. +#. List the currently set quota values for a project. .. code-block:: console @@ -132,10 +132,10 @@ To view quota values for an existing tenant (project) | server_group_members | 10 | +-----------------------------+-------+ -To update quota values for an existing tenant (project) -------------------------------------------------------- +To update quota values for an existing project +---------------------------------------------- -#. Obtain the tenant ID. +#. Obtain the project ID. .. code-block:: console @@ -181,11 +181,11 @@ To update quota values for an existing tenant (project) $ nova help quota-update -View and update Compute quotas for a tenant user -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +View and update Compute quotas for a project user +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To view quota values for a tenant user --------------------------------------- +To view quota values for a project user +--------------------------------------- #. Place the user ID in a usable variable. @@ -193,13 +193,13 @@ To view quota values for a tenant user $ tenantUser=$(openstack user show -f value -c id USER_NAME) -#. Place the user's tenant ID in a usable variable, as follows: +#. Place the user's project ID in a usable variable, as follows: .. code-block:: console $ tenant=$(openstack project show -f value -c id TENANT_NAME) -#. List the currently set quota values for a tenant user. +#. List the currently set quota values for a project user. .. code-block:: console @@ -229,8 +229,8 @@ To view quota values for a tenant user | server_group_members | 10 | +-----------------------------+-------+ -To update quota values for a tenant user ----------------------------------------- +To update quota values for a project user +----------------------------------------- #. Place the user ID in a usable variable. @@ -238,7 +238,7 @@ To update quota values for a tenant user $ tenantUser=$(openstack user show -f value -c id USER_NAME) -#. Place the user's tenant ID in a usable variable, as follows: +#. Place the user's project ID in a usable variable, as follows: .. code-block:: console @@ -284,8 +284,8 @@ To update quota values for a tenant user $ nova help quota-update -To display the current quota usage for a tenant user ----------------------------------------------------- +To display the current quota usage for a project user +----------------------------------------------------- Use :command:`nova absolute-limits` to get a list of the current quota values and the current quota usage: diff --git a/doc/admin-guide/source/cli-set-quotas.rst b/doc/admin-guide/source/cli-set-quotas.rst index 3d3f4f9da0..6b305be3de 100644 --- a/doc/admin-guide/source/cli-set-quotas.rst +++ b/doc/admin-guide/source/cli-set-quotas.rst @@ -7,21 +7,21 @@ Manage quotas To prevent system capacities from being exhausted without notification, you can set up quotas. Quotas are operational limits. For example, the number of gigabytes allowed for each -tenant can be controlled so that cloud resources are optimized. -Quotas can be enforced at both the tenant (or project) -and the tenant-user level. +project can be controlled so that cloud resources are optimized. +Quotas can be enforced at both the project +and the project-user level. Using the command-line interface, you can manage quotas for the OpenStack Compute service, the OpenStack Block Storage service, and the OpenStack Networking service. The cloud operator typically changes default values because a -tenant requires more than ten volumes or 1 TB on a compute +project requires more than ten volumes or 1 TB on a compute node. .. note:: - To view all tenants (projects), run: + To view all projects, run: .. code-block:: console @@ -35,7 +35,7 @@ node. | f599c5cd1cba4125ae3d7caed08e288c | tenant02 | +----------------------------------+----------+ - To display all current users for a tenant, run: + To display all current users for a project, run: .. code-block:: console diff --git a/doc/admin-guide/source/compute-flavors.rst b/doc/admin-guide/source/compute-flavors.rst index 862db099ec..0c2a5db749 100644 --- a/doc/admin-guide/source/compute-flavors.rst +++ b/doc/admin-guide/source/compute-flavors.rst @@ -61,7 +61,7 @@ Flavors define these elements: | | or NSX based systems. | +-------------+---------------------------------------------------------------+ | Is Public | Boolean value, whether flavor is available to all users or p\ | -| | rivate to the tenant it was created in. Defaults to ``True``. | +| | rivate to the project it was created in. Defaults to ``True``.| +-------------+---------------------------------------------------------------+ | Extra Specs | Key and value pairs that define on which compute nodes a fla\ | | | vor can run. These pairs must match corresponding pairs on t\ | diff --git a/doc/admin-guide/source/compute-manage-the-cloud.rst b/doc/admin-guide/source/compute-manage-the-cloud.rst index 859b497544..9981e2988c 100644 --- a/doc/admin-guide/source/compute-manage-the-cloud.rst +++ b/doc/admin-guide/source/compute-manage-the-cloud.rst @@ -53,7 +53,7 @@ specific commands might be restricted by the Identity service. #. Set the required parameters as environment variables to make running commands easier. For example, you can add :option:`--os-username` as an ``openstack`` option, or set it as an environment variable. To set the user - name, password, and tenant as environment variables, use: + name, password, and project as environment variables, use: .. code-block:: console diff --git a/doc/admin-guide/source/compute-networking-nova.rst b/doc/admin-guide/source/compute-networking-nova.rst index b660b1418e..a2bca41d0e 100644 --- a/doc/admin-guide/source/compute-networking-nova.rst +++ b/doc/admin-guide/source/compute-networking-nova.rst @@ -94,28 +94,28 @@ Flat DHCP Network Manager VLAN Network Manager This is the default mode for OpenStack Compute. In this mode, - Compute creates a VLAN and bridge for each tenant. For + Compute creates a VLAN and bridge for each project. For multiple-machine installations, the VLAN Network Mode requires a - switch that supports VLAN tagging (IEEE 802.1Q). The tenant gets a + switch that supports VLAN tagging (IEEE 802.1Q). The project gets a range of private IPs that are only accessible from inside the VLAN. - In order for a user to access the instances in their tenant, a + In order for a user to access the instances in their project, a special VPN instance (code named ``cloudpipe``) needs to be created. Compute generates a certificate and key for the user to access the VPN and starts the VPN automatically. It provides a private network - segment for each tenant's instances that can be accessed through a + segment for each project's instances that can be accessed through a dedicated VPN connection from the internet. In this mode, each - tenant gets its own VLAN, Linux networking bridge, and subnet. + project gets its own VLAN, Linux networking bridge, and subnet. The subnets are specified by the network administrator, and are - assigned dynamically to a tenant when required. A DHCP server is + assigned dynamically to a project when required. A DHCP server is started for each VLAN to pass out IP addresses to VM instances from - the subnet assigned to the tenant. All instances belonging to one - tenant are bridged into the same VLAN for that tenant. OpenStack + the subnet assigned to the project. All instances belonging to one + project are bridged into the same VLAN for that project. OpenStack Compute creates the Linux networking bridges and VLANs when required. These network managers can co-exist in a cloud system. However, because -you cannot select the type of network for a given tenant, you cannot +you cannot select the type of network for a given project, you cannot configure multiple network types in a single Compute installation. All network managers configure the network using network drivers. For @@ -155,7 +155,7 @@ All machines must have a public and internal network interface interface, and ``flat_interface`` and ``vlan_interface`` for the internal interface with flat or VLAN managers). This guide refers to the public network as the external network and the private network as the -internal or tenant network. +internal or project network. For flat and flat DHCP modes, use the :command:`nova network-create` command to create a network: @@ -789,7 +789,7 @@ Using multinic -------------- In order to use multinic, create two networks, and attach them to the -tenant (named ``project`` on the command line): +project (named ``project`` on the command line): .. code-block:: console diff --git a/doc/admin-guide/source/dashboard-set-quotas.rst b/doc/admin-guide/source/dashboard-set-quotas.rst index 9e923ed5b4..0adf1770ab 100644 --- a/doc/admin-guide/source/dashboard-set-quotas.rst +++ b/doc/admin-guide/source/dashboard-set-quotas.rst @@ -9,15 +9,15 @@ View and manage quotas To prevent system capacities from being exhausted without notification, you can set up quotas. Quotas are operational limits. For example, the -number of gigabytes allowed for each tenant can be controlled so that -cloud resources are optimized. Quotas can be enforced at both the tenant -(or project) and the tenant-user level. +number of gigabytes allowed for each project can be controlled so that +cloud resources are optimized. Quotas can be enforced at both the project +and the project-user level. Typically, you change quotas when a project needs more than ten volumes or 1 |nbsp| TB on a compute node. Using the Dashboard, you can view default Compute and Block Storage -quotas for new tenants, as well as update quotas for existing tenants. +quotas for new projects, as well as update quotas for existing projects. .. note:: @@ -26,7 +26,7 @@ quotas for new tenants, as well as update quotas for existing tenants. the OpenStack Networking service (see `OpenStack Administrator Guide `_). Additionally, you can update Compute service quotas for - tenant users. + project users. The following table describes the Compute and Block Storage service quotas: diff --git a/doc/admin-guide/source/dashboard-view-cloud-resources.rst b/doc/admin-guide/source/dashboard-view-cloud-resources.rst index 1407213825..2286dc08b8 100644 --- a/doc/admin-guide/source/dashboard-view-cloud-resources.rst +++ b/doc/admin-guide/source/dashboard-view-cloud-resources.rst @@ -31,7 +31,7 @@ View resource statistics #. Click the: - * :guilabel:`Usage Report` tab to view a usage report per tenant (project) + * :guilabel:`Usage Report` tab to view a usage report per project by specifying the time period (or even use a calendar to define a date range). diff --git a/doc/admin-guide/source/identity-auth-token-middleware.rst b/doc/admin-guide/source/identity-auth-token-middleware.rst index f5a70b8d5f..9bfebad1ec 100644 --- a/doc/admin-guide/source/identity-auth-token-middleware.rst +++ b/doc/admin-guide/source/identity-auth-token-middleware.rst @@ -63,8 +63,8 @@ This sample paste config filter makes use of the ``admin_user`` and .. note:: - Using this option requires an admin tenant/role relationship. The - admin user is granted access to the admin role on the admin tenant. + Using this option requires an admin project/role relationship. The + admin user is granted access to the admin role on the admin project. .. note:: diff --git a/doc/admin-guide/source/identity-concepts.rst b/doc/admin-guide/source/identity-concepts.rst index 177dedd8b0..9a77fbbadb 100644 --- a/doc/admin-guide/source/identity-concepts.rst +++ b/doc/admin-guide/source/identity-concepts.rst @@ -127,17 +127,17 @@ Identity user management examples: Compute service's ``policy.json`` file to require this role for Compute operations. -The Identity service assigns a tenant and a role to a user. You might +The Identity service assigns a project and a role to a user. You might assign the ``compute-user`` role to the ``alice`` user in the ``acme`` -tenant: +project: .. code-block:: console $ openstack role add --project acme --user alice compute-user -A user can have different roles in different tenants. For example, Alice -might also have the ``admin`` role in the ``Cyberdyne`` tenant. A user -can also have multiple roles in the same tenant. +A user can have different roles in different projects. For example, Alice +might also have the ``admin`` role in the ``Cyberdyne`` project. A user +can also have multiple roles in the same project. The ``/etc/[SERVICE_CODENAME]/policy.json`` file controls the tasks that users can perform for a given service. For example, the @@ -149,7 +149,7 @@ the Identity service. The default ``policy.json`` files in the Compute, Identity, and Image services recognize only the ``admin`` role. Any user with -any role in a tenant can access all operations that do not require the +any role in a project can access all operations that do not require the ``admin`` role. To restrict users from performing operations in, for example, the @@ -164,11 +164,11 @@ file does not restrict which users can create volumes: "volume:create": "", -If the user has any role in a tenant, he can create volumes in that -tenant. +If the user has any role in a project, he can create volumes in that +project. To restrict the creation of volumes to users who have the -``compute-user`` role in a particular tenant, you add ``"role:compute-user"``: +``compute-user`` role in a particular project, you add ``"role:compute-user"``: .. code-block:: json @@ -300,7 +300,7 @@ services. It consists of: The Identity service also maintains a user that corresponds to each service, such as, a user named ``nova`` for the Compute service, and a -special service tenant called ``service``. +special service project called ``service``. For information about how to create services and endpoints, see the `OpenStack Administrator Guide