openstack/heat
Code Issues Proposed changes

heat config eliminate ec2authtoken

Browse Source 
eliminate [ec2authtoken] section, if auth_uri is specified in
'clients_keystone' section

Change-Id: Ie11139a5d9a176037f1c9f50a62ff6dbd1b20b8f
Closes-Bug: #1705664
This commit is contained in:
npraveen35
2017-08-01 19:02:30 +05:30
committed by Praveen N
parent c9b5e63f1d
commit e18a523c99
4 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/install/install-debian.rst
View File

@@ -23,16 +23,6 @@ Install and configure components
:doc:`service endpoint registration <debconf/debconf-api-endpoints>`, :doc:`service endpoint registration <debconf/debconf-api-endpoints>`,
and :doc:`message broker credentials <debconf/debconf-rabbitmq>`. and :doc:`message broker credentials <debconf/debconf-rabbitmq>`.
#. 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 Finalize installation
--------------------- ---------------------

8
doc/source/install/install-obs.rst
View File

@@ -348,8 +348,8 @@ Install and configure components
Replace ``RABBIT_PASS`` with the password you chose for the Replace ``RABBIT_PASS`` with the password you chose for the
``openstack`` account in ``RabbitMQ``. ``openstack`` account in ``RabbitMQ``.
* In the ``[keystone_authtoken]``, ``[trustee]``, * In the ``[keystone_authtoken]``, ``[trustee]``
``[clients_keystone]``, and ``[ec2authtoken]`` sections, and ``[clients_keystone]`` sections,
configure Identity service access: configure Identity service access:
.. code-block:: none .. code-block:: none
@@ -376,10 +376,6 @@ Install and configure components
[clients_keystone] [clients_keystone]
... ...
auth_uri = http://controller:35357
[ec2authtoken]
...
auth_uri = http://controller:5000 auth_uri = http://controller:5000
Replace ``HEAT_PASS`` with the password you chose for the Replace ``HEAT_PASS`` with the password you chose for the

6
doc/source/install/install-rdo.rst
View File

@@ -349,7 +349,7 @@ Install and configure components
``openstack`` account in ``RabbitMQ``. ``openstack`` account in ``RabbitMQ``.
* In the ``[keystone_authtoken]``, ``[trustee]``, * In the ``[keystone_authtoken]``, ``[trustee]``,
``[clients_keystone]``, and ``[ec2authtoken]`` sections, and ``[clients_keystone]`` sections,
configure Identity service access: configure Identity service access:
.. code-block:: none .. code-block:: none
@@ -376,10 +376,6 @@ Install and configure components
[clients_keystone] [clients_keystone]
... ...
auth_uri = http://controller:35357
[ec2authtoken]
...
auth_uri = http://controller:5000 auth_uri = http://controller:5000
Replace ``HEAT_PASS`` with the password you chose for the Replace ``HEAT_PASS`` with the password you chose for the

8
doc/source/install/install-ubuntu.rst
View File

@@ -347,8 +347,8 @@ Install and configure components
Replace ``RABBIT_PASS`` with the password you chose for the Replace ``RABBIT_PASS`` with the password you chose for the
``openstack`` account in ``RabbitMQ``. ``openstack`` account in ``RabbitMQ``.
* In the ``[keystone_authtoken]``, ``[trustee]``, * In the ``[keystone_authtoken]``, ``[trustee]`` and
``[clients_keystone]``, and ``[ec2authtoken]`` sections, ``[clients_keystone]`` sections,
configure Identity service access: configure Identity service access:
.. code-block:: none .. code-block:: none
@@ -375,10 +375,6 @@ Install and configure components
[clients_keystone] [clients_keystone]
... ...
auth_uri = http://controller:35357
[ec2authtoken]
...
auth_uri = http://controller:5000 auth_uri = http://controller:5000
Replace ``HEAT_PASS`` with the password you chose for the Replace ``HEAT_PASS`` with the password you chose for the