Fix Debian install (remove Debconf)

Since the Debconf stuff is moved to a separate guide, do like
for keystone: remove the conditionals, and set it closer to
what's done in Ubuntu.

Change-Id: Id2ada6f35a1bbd0337eca6a8165013f7eab655d2
This commit is contained in:
Thomas Goirand 2016-07-20 14:43:45 +02:00
parent 3c90965a3b
commit cfb1c18cbb

View File

@ -5,8 +5,6 @@ This section describes how to install and configure the Image service,
code-named glance, on the controller node. For simplicity, this code-named glance, on the controller node. For simplicity, this
configuration stores images on the local file system. configuration stores images on the local file system.
.. only:: obs or rdo or ubuntu
Prerequisites Prerequisites
------------- -------------
@ -148,8 +146,6 @@ configuration stores images on the local file system.
Install and configure components Install and configure components
-------------------------------- --------------------------------
.. only:: obs or rdo or ubuntu
.. include:: shared/note_configuration_vary_by_distribution.rst .. include:: shared/note_configuration_vary_by_distribution.rst
.. only:: obs .. only:: obs
@ -168,7 +164,7 @@ Install and configure components
# yum install openstack-glance # yum install openstack-glance
.. only:: ubuntu .. only:: ubuntu or debian
#. Install the packages: #. Install the packages:
@ -176,8 +172,6 @@ Install and configure components
# apt-get install glance # apt-get install glance
.. only:: obs or rdo or ubuntu
2. Edit the ``/etc/glance/glance-api.conf`` file and complete the 2. Edit the ``/etc/glance/glance-api.conf`` file and complete the
following actions: following actions:
@ -275,7 +269,7 @@ Install and configure components
Comment out or remove any other options in the Comment out or remove any other options in the
``[keystone_authtoken]`` section. ``[keystone_authtoken]`` section.
.. only:: rdo or ubuntu .. only:: rdo or ubuntu or debian
4. Populate the Image service database: 4. Populate the Image service database:
@ -287,29 +281,6 @@ Install and configure components
Ignore any deprecation messages in this output. Ignore any deprecation messages in this output.
.. only:: debian
#. Install the packages:
.. code-block:: console
# apt-get install glance python-glanceclient
#. Respond to prompts for debconf.
.. :doc:`database management <debconf/debconf-dbconfig-common>`,
:doc:`Identity service credentials <debconf/debconf-keystone-authtoken>`,
:doc:`service endpoint registration <debconf/debconf-api-endpoints>`,
and :doc:`message broker credentials <debconf/debconf-rabbitmq>`.
#. Select the ``keystone`` pipeline to configure the Image service
to use the Identity service:
.. image:: figures/debconf-screenshots/glance-common_pipeline_flavor.png
:width: 100%
.. only:: obs or rdo or ubuntu
Finalize installation Finalize installation
--------------------- ---------------------
@ -325,7 +296,7 @@ Install and configure components
# systemctl start openstack-glance-api.service \ # systemctl start openstack-glance-api.service \
openstack-glance-registry.service openstack-glance-registry.service
.. only:: ubuntu .. only:: ubuntu or debian
#. Restart the Image services: #. Restart the Image services: