[install] ADMIN_PASSWORD --> ADMIN_PASS

The install guide consistently uses *_PASS for its password
replacement labels. ADMIN_PASSWORD was introduced when updating
keystone for bootstrap.

This broke consistency with both the Environment --> Security
section, and also the Create a domain, projects, users, and roles
section that follows keystone set-up.

In order to avoid an onslaught of bug reports from the copy/paste
crowd, this patch changes ADMIN_PASSWORD to ADMIN_PASS in the
keystone setup section, keeping the other sections at the original
ADMIN_PASS.

Change-Id: Idf8a9033f229ce325f5e4eb9da6d1241b9923cd3
This commit is contained in:
Tom Fifield 2016-10-03 22:10:22 +08:00
parent d08ad346fa
commit e9f6757e1b

View File

@ -161,7 +161,7 @@ Install and configure components
.. code-block:: console
# keystone-manage bootstrap --bootstrap-password ADMIN_PASSWORD \
# keystone-manage bootstrap --bootstrap-password ADMIN_PASS \
--bootstrap-admin-url http://controller:35357/v3/ \
--bootstrap-internal-url http://controller:35357/v3/ \
--bootstrap-public-url http://controller:5000/v3/ \
@ -169,7 +169,7 @@ Install and configure components
.. end
Replace ``ADMIN_PASSWORD`` with a suitable password for an administrative user.
Replace ``ADMIN_PASS`` with a suitable password for an administrative user.
.. only:: rdo
@ -374,7 +374,7 @@ Install and configure components
.. code-block:: console
$ export OS_USERNAME=admin
$ export OS_PASSWORD=ADMIN_PASSWORD
$ export OS_PASSWORD=ADMIN_PASS
$ export OS_PROJECT_NAME=admin
$ export OS_USER_DOMAIN_NAME=Default
$ export OS_PROJECT_DOMAIN_NAME=Default
@ -385,7 +385,7 @@ Install and configure components
.. only:: obs or rdo or ubuntu
Replace ``ADMIN_PASSWORD`` with the password used in the
Replace ``ADMIN_PASS`` with the password used in the
``keystone-manage bootstrap`` command from the section called
:ref:`keystone-install`.