Browse code

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

Jenkins authored on 2015/11/17 02:24:42
Showing 3 changed files
... ...
@@ -250,8 +250,7 @@ These scripts are executed serially by ``exercise.sh`` in testing situations.
250 250
   database access from the exercise itself.
251 251
 
252 252
 * If specific configuration needs to be present for the exercise to complete,
253
-  it should be staged in ``stack.sh``, or called from ``stack.sh`` (see
254
-  ``files/keystone_data.sh`` for an example of this).
253
+  it should be staged in ``stack.sh``, or called from ``stack.sh``.
255 254
 
256 255
 * The ``OS_*`` environment variables should be the only ones used for all
257 256
   authentication to OpenStack clients as documented in the CLIAuth_ wiki page.
... ...
@@ -394,7 +394,7 @@ with ``KEYSTONE_CATALOG_BACKEND``:
394 394
         KEYSTONE_CATALOG_BACKEND=template
395 395
 
396 396
 DevStack's default configuration in ``sql`` mode is set in
397
-``files/keystone_data.sh``
397
+``lib/keystone``
398 398
 
399 399
 
400 400
 Guest Images
... ...
@@ -23,7 +23,7 @@
23 23
 #
24 24
 # Optional Dependencies:
25 25
 #
26
-# - ``ALT_*`` (similar vars exists in keystone_data.sh)
26
+# - ``ALT_*``
27 27
 # - ``LIVE_MIGRATION_AVAILABLE``
28 28
 # - ``USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION``
29 29
 # - ``DEFAULT_INSTANCE_TYPE``