From 5194a369613588fb805450e9288ee636cfbcaf8f Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Tue, 3 Oct 2017 21:37:43 +0000 Subject: [PATCH] Remove admin_token_auth steps from install guide The installation guide previously listed this as a step but it is no longer needed since `admin_token_auth` is no longer in the paste file by default Change-Id: If36bafbecd657c3acd769f11636a1d844be0ac66 Closes-Bug: 1716797 --- doc/source/install/keystone-verify-obs.rst | 14 +++----------- doc/source/install/keystone-verify-rdo.rst | 14 +++----------- doc/source/install/keystone-verify-ubuntu.rst | 14 +++----------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/doc/source/install/keystone-verify-obs.rst b/doc/source/install/keystone-verify-obs.rst index ae9f3bedc8..91a11a019b 100644 --- a/doc/source/install/keystone-verify-obs.rst +++ b/doc/source/install/keystone-verify-obs.rst @@ -8,15 +8,7 @@ services. Perform these commands on the controller node. -#. For security reasons, disable the temporary authentication - token mechanism: - - Edit the ``/etc/keystone/keystone-paste.ini`` - file and remove ``admin_token_auth`` from the - ``[pipeline:public_api]``, ``[pipeline:admin_api]``, - and ``[pipeline:api_v3]`` sections. - -2. Unset the temporary ``OS_AUTH_URL`` and ``OS_PASSWORD`` +#. Unset the temporary ``OS_AUTH_URL`` and ``OS_PASSWORD`` environment variable: .. code-block:: console @@ -25,7 +17,7 @@ services. .. end -3. As the ``admin`` user, request an authentication token: +#. As the ``admin`` user, request an authentication token: .. code-block:: console @@ -51,7 +43,7 @@ services. This command uses the password for the ``admin`` user. -4. As the ``demo`` user, request an authentication token: +#. As the ``demo`` user, request an authentication token: .. code-block:: console diff --git a/doc/source/install/keystone-verify-rdo.rst b/doc/source/install/keystone-verify-rdo.rst index ae9f3bedc8..91a11a019b 100644 --- a/doc/source/install/keystone-verify-rdo.rst +++ b/doc/source/install/keystone-verify-rdo.rst @@ -8,15 +8,7 @@ services. Perform these commands on the controller node. -#. For security reasons, disable the temporary authentication - token mechanism: - - Edit the ``/etc/keystone/keystone-paste.ini`` - file and remove ``admin_token_auth`` from the - ``[pipeline:public_api]``, ``[pipeline:admin_api]``, - and ``[pipeline:api_v3]`` sections. - -2. Unset the temporary ``OS_AUTH_URL`` and ``OS_PASSWORD`` +#. Unset the temporary ``OS_AUTH_URL`` and ``OS_PASSWORD`` environment variable: .. code-block:: console @@ -25,7 +17,7 @@ services. .. end -3. As the ``admin`` user, request an authentication token: +#. As the ``admin`` user, request an authentication token: .. code-block:: console @@ -51,7 +43,7 @@ services. This command uses the password for the ``admin`` user. -4. As the ``demo`` user, request an authentication token: +#. As the ``demo`` user, request an authentication token: .. code-block:: console diff --git a/doc/source/install/keystone-verify-ubuntu.rst b/doc/source/install/keystone-verify-ubuntu.rst index ae9f3bedc8..91a11a019b 100644 --- a/doc/source/install/keystone-verify-ubuntu.rst +++ b/doc/source/install/keystone-verify-ubuntu.rst @@ -8,15 +8,7 @@ services. Perform these commands on the controller node. -#. For security reasons, disable the temporary authentication - token mechanism: - - Edit the ``/etc/keystone/keystone-paste.ini`` - file and remove ``admin_token_auth`` from the - ``[pipeline:public_api]``, ``[pipeline:admin_api]``, - and ``[pipeline:api_v3]`` sections. - -2. Unset the temporary ``OS_AUTH_URL`` and ``OS_PASSWORD`` +#. Unset the temporary ``OS_AUTH_URL`` and ``OS_PASSWORD`` environment variable: .. code-block:: console @@ -25,7 +17,7 @@ services. .. end -3. As the ``admin`` user, request an authentication token: +#. As the ``admin`` user, request an authentication token: .. code-block:: console @@ -51,7 +43,7 @@ services. This command uses the password for the ``admin`` user. -4. As the ``demo`` user, request an authentication token: +#. As the ``demo`` user, request an authentication token: .. code-block:: console