From f4f7699c234d4b02a2349d266181f0ae98050681 Mon Sep 17 00:00:00 2001 From: Hai Shi Date: Sun, 26 Feb 2017 23:31:14 +0800 Subject: [PATCH] [DOC] Remove redundant info of 'rally show' in docs As subject, removing the redudant info in docs. Change-Id: I816030b649b79b2e00c4c3f5a94a72676689a933 --- ...env_and_running_benchmark_from_samples.rst | 42 ++++++++++--------- ...tep_3_benchmarking_with_existing_users.rst | 42 +------------------ 2 files changed, 24 insertions(+), 60 deletions(-) diff --git a/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst b/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst index d76250a1..4ebff6af 100644 --- a/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst +++ b/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst @@ -202,30 +202,32 @@ image and flavor name to be used for server creation, since concrete names might differ from installation to installation. If this benchmark task fails, then the reason for that might a non-existing image/flavor specified in the task. To check what images/flavors are available in the deployment you are -currently benchmarking, you might use the *rally show* command: +currently benchmarking, you might use the the following commands: .. code-block:: console - $ rally show images - +--------------------------------------+-----------------------+-----------+ - | UUID | Name | Size (B) | - +--------------------------------------+-----------------------+-----------+ - | 8dfd6098-0c26-4cb5-8e77-1ecb2db0b8ae | CentOS 6.5 (x86_64) | 344457216 | - | 2b8d119e-9461-48fc-885b-1477abe2edc5 | CirrOS 0.3.4 (x86_64) | 13287936 | - +--------------------------------------+-----------------------+-----------+ + $ source ~/.rally/openrc + $ openstack image list + +--------------------------------------+---------------------------------+--------+ + | ID | Name | Status | + +--------------------------------------+---------------------------------+--------+ + | 30dc3b46-4a4b-4fcc-932c-91fa87753902 | cirros-0.3.4-x86_64-uec | active | + | d687fc2a-75bd-4194-90c7-1619af255b04 | cirros-0.3.4-x86_64-uec-kernel | active | + | c764d543-027d-47a3-b46e-0c1c8a68635d | cirros-0.3.4-x86_64-uec-ramdisk | active | + +--------------------------------------+---------------------------------+--------+ - $ rally show flavors - - Flavors for user `admin` in tenant `admin`: - +----+-----------+-------+----------+-----------+-----------+ - | ID | Name | vCPUs | RAM (MB) | Swap (MB) | Disk (GB) | - +----+-----------+-------+----------+-----------+-----------+ - | 1 | m1.tiny | 1 | 512 | | 1 | - | 2 | m1.small | 1 | 2048 | | 20 | - | 3 | m1.medium | 2 | 4096 | | 40 | - | 4 | m1.large | 4 | 8192 | | 80 | - | 5 | m1.xlarge | 8 | 16384 | | 160 | - +----+-----------+-------+----------+-----------+-----------+ + $ openstack flavor list + +----+-----------+-------+------+-----------+-------+-----------+ + | ID | Name | RAM | Disk | Ephemeral | VCPUs | Is Public | + +----+-----------+-------+------+-----------+-------+-----------+ + | 1 | m1.tiny | 512 | 1 | 0 | 1 | True | + | 2 | m1.small | 2048 | 20 | 0 | 1 | True | + | 3 | m1.medium | 4096 | 40 | 0 | 2 | True | + | 4 | m1.large | 8192 | 80 | 0 | 4 | True | + | 42 | m1.nano | 64 | 0 | 0 | 1 | True | + | 5 | m1.xlarge | 16384 | 160 | 0 | 8 | True | + | 84 | m1.micro | 128 | 0 | 0 | 1 | True | + +----+-----------+-------+------+-----------+-------+-----------+ Report generation diff --git a/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst b/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst index 12fac707..e909ea0f 100644 --- a/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst +++ b/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst @@ -91,47 +91,9 @@ it as usual: Using deployment: 1849a9bf-4b18-4fd5-89f0-ddcc56eae4c9 ~/.rally/openrc was updated - -After that, the **rally show** command lists the resources for each user -separately: - -.. code-block:: console - - $ rally show images - - Images for user `admin` in tenant `admin`: - +--------------------------------------+---------------------------------+-----------+ - | UUID | Name | Size (B) | - +--------------------------------------+---------------------------------+-----------+ - | 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.4-x86_64-uec | 25165824 | - | 87710f09-3625-4496-9d18-e20e34906b72 | Fedora-x86_64-20-20140618-sda | 209649664 | - | b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.4-x86_64-uec-ramdisk | 3740163 | - | d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.4-x86_64-uec-kernel | 4979632 | - +--------------------------------------+---------------------------------+-----------+ - - Images for user `b1` in tenant `testing`: - +--------------------------------------+---------------------------------+-----------+ - | UUID | Name | Size (B) | - +--------------------------------------+---------------------------------+-----------+ - | 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.4-x86_64-uec | 25165824 | - | 87710f09-3625-4496-9d18-e20e34906b72 | Fedora-x86_64-20-20140618-sda | 209649664 | - | b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.4-x86_64-uec-ramdisk | 3740163 | - | d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.4-x86_64-uec-kernel | 4979632 | - +--------------------------------------+---------------------------------+-----------+ - - Images for user `b2` in tenant `testing`: - +--------------------------------------+---------------------------------+-----------+ - | UUID | Name | Size (B) | - +--------------------------------------+---------------------------------+-----------+ - | 041cfd70-0e90-4ed6-8c0c-ad9c12a94191 | cirros-0.3.4-x86_64-uec | 25165824 | - | 87710f09-3625-4496-9d18-e20e34906b72 | Fedora-x86_64-20-20140618-sda | 209649664 | - | b0f269be-4859-48e0-a0ca-03fb80d14602 | cirros-0.3.4-x86_64-uec-ramdisk | 3740163 | - | d82eaf7a-ff63-4826-9aa7-5fa105610e01 | cirros-0.3.4-x86_64-uec-kernel | 4979632 | - +--------------------------------------+---------------------------------+-----------+ - With this new deployment being active, Rally will use the already existing -users *"b1"* and *"b2"* instead of creating the temporary ones when launching -benchmark task that do not specify the *"users"* context. +users instead of creating the temporary ones when launching benchmark task +that do not specify the *"users"* context. Running benchmark scenarios with existing users