summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Bragstad <lbragstad@gmail.com>2017-10-03 21:37:43 +0000
committerHongbin Lu <hongbin034@gmail.com>2017-10-08 17:16:57 +0000
commite520fb5a3d7409645f7019d2a409c69a719d09d2 (patch)
treecec22edcb536eafa1811fbbb2a024a3f4846eb80
parent6a67918f9d5f39564af8eacc57b80cba98242683 (diff)
downloadkeystone-e520fb5a3d7409645f7019d2a409c69a719d09d2.tar.gz
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 (cherry picked from commit 5194a369613588fb805450e9288ee636cfbcaf8f)
-rw-r--r--doc/source/install/keystone-verify-obs.rst14
-rw-r--r--doc/source/install/keystone-verify-rdo.rst14
-rw-r--r--doc/source/install/keystone-verify-ubuntu.rst14
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 ae9f3bedc..91a11a019 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 ae9f3bedc..91a11a019 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 ae9f3bedc..91a11a019 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