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

doc/install-guide/source/glance-install.rst

@@ -5,15 +5,13 @@ This section describes how to install and configure the Image service,
 code-named glance, on the controller node. For simplicity, this
 configuration stores images on the local file system.
 
-.. only:: obs or rdo or ubuntu
+Prerequisites
+-------------
 
-   Prerequisites
-   -------------
+Before you install and configure the Image service, you must
+create a database, service credentials, and API endpoints.
 
-   Before you install and configure the Image service, you must
-   create a database, service credentials, and API endpoints.
-
-   #. To create the database, complete these steps:
+#. To create the database, complete these steps:
 
    * Use the database access client to connect to the database
      server as the ``root`` user:
@@ -41,14 +39,14 @@ configuration stores images on the local file system.
 
    * Exit the database access client.
 
-   #. Source the ``admin`` credentials to gain access to
+#. Source the ``admin`` credentials to gain access to
    admin-only CLI commands:
 
    .. code-block:: console
 
       $ . admin-openrc
 
-   #. To create the service credentials, complete these steps:
+#. To create the service credentials, complete these steps:
 
    * Create the ``glance`` user:
 
@@ -93,7 +91,7 @@ configuration stores images on the local file system.
         | type        | image                            |
         +-------------+----------------------------------+
 
-   #. Create the Image service API endpoints:
+#. Create the Image service API endpoints:
 
    .. code-block:: console
 
@@ -148,9 +146,7 @@ configuration stores images on the local file system.
 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
 
@@ -168,7 +164,7 @@ Install and configure components
 
          # yum install openstack-glance
 
-.. only:: ubuntu
+.. only:: ubuntu or debian
 
    #. Install the packages:
 
@@ -176,9 +172,7 @@ Install and configure components
 
          # 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:
 
    * In the ``[database]`` section, configure database access:
@@ -232,7 +226,7 @@ Install and configure components
         default_store = file
         filesystem_store_datadir = /var/lib/glance/images/
 
-   3. Edit the ``/etc/glance/glance-registry.conf`` file and complete
+3. Edit the ``/etc/glance/glance-registry.conf`` file and complete
    the following actions:
 
    * In the ``[database]`` section, configure database access:
@@ -275,7 +269,7 @@ Install and configure components
         Comment out or remove any other options in the
         ``[keystone_authtoken]`` section.
 
-.. only:: rdo or ubuntu
+.. only:: rdo or ubuntu or debian
 
    4. Populate the Image service database:
 
@@ -287,33 +281,10 @@ Install and configure components
 
          Ignore any deprecation messages in this output.
 
-.. only:: debian
+Finalize installation
+---------------------
 
-   #. 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
-   ---------------------
-
-   .. only:: obs or rdo
+.. only:: obs or rdo
 
    * Start the Image services and configure them to start when
      the system boots:
@@ -325,7 +296,7 @@ Install and configure components
         # systemctl start openstack-glance-api.service \
           openstack-glance-registry.service
 
-   .. only:: ubuntu
+.. only:: ubuntu or debian
 
    #. Restart the Image services: