Merge "Delete some comment or messages of keystone_data.sh(removed)"

This commit is contained in:
Jenkins 2015-11-16 17:24:42 +00:00 committed by Gerrit Code Review
commit 8f07ef84db
3 changed files with 3 additions and 4 deletions

View File

@ -250,8 +250,7 @@ These scripts are executed serially by ``exercise.sh`` in testing situations.
database access from the exercise itself. database access from the exercise itself.
* If specific configuration needs to be present for the exercise to complete, * If specific configuration needs to be present for the exercise to complete,
it should be staged in ``stack.sh``, or called from ``stack.sh`` (see it should be staged in ``stack.sh``, or called from ``stack.sh``.
``files/keystone_data.sh`` for an example of this).
* The ``OS_*`` environment variables should be the only ones used for all * The ``OS_*`` environment variables should be the only ones used for all
authentication to OpenStack clients as documented in the CLIAuth_ wiki page. authentication to OpenStack clients as documented in the CLIAuth_ wiki page.

View File

@ -394,7 +394,7 @@ with ``KEYSTONE_CATALOG_BACKEND``:
KEYSTONE_CATALOG_BACKEND=template KEYSTONE_CATALOG_BACKEND=template
DevStack's default configuration in ``sql`` mode is set in DevStack's default configuration in ``sql`` mode is set in
``files/keystone_data.sh`` ``lib/keystone``
Guest Images Guest Images

View File

@ -23,7 +23,7 @@
# #
# Optional Dependencies: # Optional Dependencies:
# #
# - ``ALT_*`` (similar vars exists in keystone_data.sh) # - ``ALT_*``
# - ``LIVE_MIGRATION_AVAILABLE`` # - ``LIVE_MIGRATION_AVAILABLE``
# - ``USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION`` # - ``USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION``
# - ``DEFAULT_INSTANCE_TYPE`` # - ``DEFAULT_INSTANCE_TYPE``