openstack
/
heat
Code Issues Proposed changes

Merge "heat config eliminate ec2authtoken"

This commit is contained in:
Jenkins 2017-08-23 07:13:16 +00:00 committed by Gerrit Code Review
parent 8cd29aef67 e18a523c99
commit 1745ed55cc
4 changed files with 5 additions and 27 deletions
Show Stats 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>`,
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
---------------------

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
``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

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

@ -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

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
``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