From 3f37cbf4ddceb12076c4e584d4e3742f18ef10a4 Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Tue, 13 Feb 2018 19:19:26 +0200 Subject: [PATCH] [docs] Fix several deployment configs Change-Id: I9ff455682270ae4686f901ee703094c484039ffc --- .../step_10_profiling_openstack_internals.rst | 3 -- ...tep_3_benchmarking_with_existing_users.rst | 54 +++++++++---------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/doc/source/quick_start/tutorial/step_10_profiling_openstack_internals.rst b/doc/source/quick_start/tutorial/step_10_profiling_openstack_internals.rst index 87ac6ffb..4a3e3ac9 100644 --- a/doc/source/quick_start/tutorial/step_10_profiling_openstack_internals.rst +++ b/doc/source/quick_start/tutorial/step_10_profiling_openstack_internals.rst @@ -51,12 +51,9 @@ add the HMAC key with the following : .. code-block:: json { - "type": "ExistingCloud", - "creds": { "openstack": { [...] "profiler_hmac_key": "SECRET_KEY" - } } } 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 d3bdb106..99ab6724 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 @@ -41,36 +41,36 @@ Registering deployment with existing users in Rally The information about existing users in your OpenStack cloud should be passed to Rally at the :ref:`deployment initialization step `. -You have to use the **ExistingCloud** deployment plugin that just provides -Rally with credentials of an already existing cloud. The difference from the -deployment configuration we've seen previously is that you should set up the -*"users"* section with the credentials of already existing users. Let's call -this deployment configuration file *existing_users.json*: +The difference from the deployment configuration we've seen previously is that +you should set up the *"users"* section with the credentials of already +existing users. Let's call this deployment configuration file +*existing_users.json*: .. code-block:: json { - "type": "ExistingCloud", - "auth_url": "http://example.net:5000/v2.0/", - "region_name": "RegionOne", - "endpoint_type": "public", - "admin": { - "username": "admin", - "password": "pa55word", - "tenant_name": "demo" - }, - "users": [ - { - "username": "b1", - "password": "1234", - "tenant_name": "testing" - }, - { - "username": "b2", - "password": "1234", - "tenant_name": "testing" - } - ] + "openstack": { + "auth_url": "http://example.net:5000/v2.0/", + "region_name": "RegionOne", + "endpoint_type": "public", + "admin": { + "username": "admin", + "password": "pa55word", + "tenant_name": "demo" + }, + "users": [ + { + "username": "b1", + "password": "1234", + "tenant_name": "testing" + }, + { + "username": "b2", + "password": "1234", + "tenant_name": "testing" + } + ] + } } This deployment configuration requires some basic information about the @@ -81,7 +81,7 @@ it as usual: .. code-block:: console - $ rally deployment create --file existings_users --name our_cloud + $ rally deployment create --file existing_users --name our_cloud +--------------------------------------+----------------------------+-----------+------------------+--------+ | uuid | created_at | name | status | active | +--------------------------------------+----------------------------+-----------+------------------+--------+