Merge "Fix docstring from nova and typo in tutorial"

This commit is contained in:
Jenkins 2015-05-08 15:28:15 +00:00 committed by Gerrit Code Review
commit 1834286973
2 changed files with 3 additions and 3 deletions

View File

@ -34,7 +34,7 @@ You can try to deploy OpenStack in your Virtual Machine using this script. Edit
.. code-block:: none
$ rally deployment create --file=samples/deployments/devstack-in-existing-servers.json.json --name=new-devstack
$ rally deployment create --file=samples/deployments/devstack-in-existing-servers.json --name=new-devstack
+---------------------------+----------------------------+--------------+------------------+
| uuid | created_at | name | status |
+---------------------------+----------------------------+--------------+------------------+

View File

@ -92,8 +92,8 @@ class NovaScenario(base.Scenario):
Returns when the server is actually booted and in "ACTIVE" state.
If multiple networks are present, the first network found that
isn't associated with a floating IP pool is used.
If multiple networks created by Network context are present, the first
network found that isn't associated with a floating IP pool is used.
:param image_id: int, image ID for server creation
:param flavor_id: int, flavor ID for server creation