From e18a523c9960ac5640eb9fefd4f447ae435cd3f4 Mon Sep 17 00:00:00 2001 From: npraveen35 Date: Tue, 1 Aug 2017 19:02:30 +0530 Subject: [PATCH] heat config eliminate ec2authtoken eliminate [ec2authtoken] section, if auth_uri is specified in 'clients_keystone' section Change-Id: Ie11139a5d9a176037f1c9f50a62ff6dbd1b20b8f Closes-Bug: #1705664 --- doc/source/install/install-debian.rst | 10 ---------- doc/source/install/install-obs.rst | 8 ++------ doc/source/install/install-rdo.rst | 6 +----- doc/source/install/install-ubuntu.rst | 8 ++------ 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/doc/source/install/install-debian.rst b/doc/source/install/install-debian.rst index 055b7f8411..c3622ee8c2 100644 --- a/doc/source/install/install-debian.rst +++ b/doc/source/install/install-debian.rst @@ -23,16 +23,6 @@ Install and configure components :doc:`service endpoint registration `, and :doc:`message broker credentials `. -#. Edit the ``/etc/heat/heat.conf`` file and complete the following - actions: - - * In the ``[ec2authtoken]`` section, configure Identity service access: - - .. code-block:: none - - [ec2authtoken] - ... - auth_uri = http://controller:5000/v2.0 Finalize installation --------------------- diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst index 5babecf785..436ad8db29 100644 --- a/doc/source/install/install-obs.rst +++ b/doc/source/install/install-obs.rst @@ -348,8 +348,8 @@ Install and configure components Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``. - * In the ``[keystone_authtoken]``, ``[trustee]``, - ``[clients_keystone]``, and ``[ec2authtoken]`` sections, + * In the ``[keystone_authtoken]``, ``[trustee]`` + and ``[clients_keystone]`` sections, configure Identity service access: .. code-block:: none @@ -376,10 +376,6 @@ Install and configure components [clients_keystone] ... - auth_uri = http://controller:35357 - - [ec2authtoken] - ... auth_uri = http://controller:5000 Replace ``HEAT_PASS`` with the password you chose for the diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst index a315f2e848..970975e678 100644 --- a/doc/source/install/install-rdo.rst +++ b/doc/source/install/install-rdo.rst @@ -349,7 +349,7 @@ Install and configure components ``openstack`` account in ``RabbitMQ``. * In the ``[keystone_authtoken]``, ``[trustee]``, - ``[clients_keystone]``, and ``[ec2authtoken]`` sections, + and ``[clients_keystone]`` sections, configure Identity service access: .. code-block:: none @@ -376,10 +376,6 @@ Install and configure components [clients_keystone] ... - auth_uri = http://controller:35357 - - [ec2authtoken] - ... auth_uri = http://controller:5000 Replace ``HEAT_PASS`` with the password you chose for the diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst index 1debfdcaeb..1c76841bc6 100644 --- a/doc/source/install/install-ubuntu.rst +++ b/doc/source/install/install-ubuntu.rst @@ -347,8 +347,8 @@ Install and configure components Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` account in ``RabbitMQ``. - * In the ``[keystone_authtoken]``, ``[trustee]``, - ``[clients_keystone]``, and ``[ec2authtoken]`` sections, + * In the ``[keystone_authtoken]``, ``[trustee]`` and + ``[clients_keystone]`` sections, configure Identity service access: .. code-block:: none @@ -375,10 +375,6 @@ Install and configure components [clients_keystone] ... - auth_uri = http://controller:35357 - - [ec2authtoken] - ... auth_uri = http://controller:5000 Replace ``HEAT_PASS`` with the password you chose for the