Merge "Debian consitency and links"

doc/install-guide/ch_basics.xml

@@ -449,6 +449,26 @@ bind-address            = 192.168.0.10</programlisting>
         xlink:href="http://archive.gplhost.com/readme.mirrors"
         >http://archive.gplhost.com/readme.mirrors</link>.</para>
   </section>
+  <section xml:id="basics-argparse" os="debian">
+    <title>Manually installing python-argparse</title>
+    <para>The Debian OpenStack packages are maintained on Debian Sid (aka, Debian Unstable)
+    - the current development version. The (backported) packages can run fine on Debian
+    Wheezy with a single caveat:</para>
+    <para>All the OpenStack packages are written in python. Wheezy uses Python version 2.6
+    and Python version 2.7, with Python 2.6 being the default interpreter, while Sid has
+    only Python version 2.7. There is one packaging change between these two. With
+    Python 2.6 python-argparse was a separate package that needs to be installed on its
+    own, with Python 2.7 it is included as part of the Python 2.7 packages. Unfortunately,
+    the Python 2.7 package does not have a <code>Provides: python-argparse</code> in it.</para>
+    <para>Since the packages are maintained in Sid where a require on python-argparse
+    would be an error and the Debian OpenStack maintainer only want to maintain a single
+    version of the OpenStack packages, you have to install
+    <systemitem class="library">python-argparse</systemitem> manually on each OpenStack
+    system running Debian Wheezy, before installing any other OpenStack packages. Install
+    the package with:</para>
+    <screen><prompt>#</prompt> <userinput>apt-get install python-argparse</userinput></screen>
+    <para>This applies to nearly all OpenStack packages in Wheezy.</para>
+  </section>
   <section xml:id="basics-queue">
     <title>Messaging Server</title>
     <para>On the controller node, install the messaging queue server.

doc/install-guide/section_ceilometer-install.xml

@@ -18,8 +18,9 @@
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-agent-central python-ceilometerclient</userinput></screen>
     </step>
     <step os="debian"><para>Answer to the <systemitem class="library">debconf</systemitem>
-    prompts about the API endpoint registration, the RabbitMQ credentials,
+    prompts about <link linkend="debconf-keystone_authtoken"><literal>[keystone_authtoken]</literal>
-    and the <code>keystone_autotoken</code>.</para>
+    settings</link>, the <link linkend="debconf-rabbitqm">RabbitMQ credentials</link> and
+    the <link linkend="debconf-api-endpoints">API endpoint</link> registration.</para>
     </step>
     <step>
       <para>The Metering Service uses a database to store information.

doc/install-guide/section_debconf-api-endpoints.xml

@@ -18,38 +18,38 @@
     As a consequence, this debconf screen displays every time, which
     enables the user to re-register the API in the Identity Service,
     but making sure that it is registered only once.</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/api-endpoint_1_register_endpoint.png"/>
-        fileref="figures/debconf-screenshots/api-endpoint_1_register_endpoint.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>If you answer <literal>yes</literal> to the previous prompt
     and the API service is already registered in the Identity Service
     database, do not answer <literal>yes</literal> again when you
     upgrade.</para>
   <para>The following debconf screens are necessary for the package to
     reach Keystone and register itself in the catalog.</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/api-endpoint_2_keystone_server_ip.png"/>
-        fileref="figures/debconf-screenshots/api-endpoint_2_keystone_server_ip.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>The following screen prompts for the value in the admin_token
     of Keystone, which is necessary for registering an API server in
     the Identity Service. This admin_token is normally configured
     automatically when setting-up the <systemitem class="library">keystone</systemitem>
     package.</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/api-endpoint_3_keystone_authtoken.png"/>
-        fileref="figures/debconf-screenshots/api-endpoint_3_keystone_authtoken.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>The following screen is the IP addresses of the service that
     the user is configuring. The configuration script automatically
     detects the IP address by using <code>/sbin/route</code> and
@@ -57,21 +57,21 @@
     interface that is connected to the default route). So in most
     cases, and unless you have a very specific network set up, you
     simply press ENTER.</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/api-endpoint_4_service_endpoint_ip_address.png"/>
-        fileref="figures/debconf-screenshots/api-endpoint_4_service_endpoint_ip_address.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>The last parameter is the region name for the service you are
     currently configuring. For example, <code>us-east-coast</code> or
       <code>europe-paris</code>.</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/api-endpoint_5_region_name.png"/>
-        fileref="figures/debconf-screenshots/api-endpoint_5_region_name.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
 </section>

doc/install-guide/section_debconf-dbconfig-common.xml

@@ -3,7 +3,7 @@
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
-  <title>dbconfig-common package</title>
+  <title>Database management with dbconfig-common</title>
   <para>The <systemitem class="library">dbconfig-common</systemitem>
     package provides a standard Debian interface that enables you to
     configure Debian database parameters. It includes localized
@@ -27,18 +27,22 @@
   <para>Here is a snapshot of the two configuration screens that
     appear when you re-configure the <systemitem class="service"
       >dbconfig-common</systemitem> package:</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
         <imagedata scale="40"
           fileref="figures/debconf-screenshots/dbconfig-common_keep_admin_pass.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
         <imagedata scale="40"
           fileref="figures/debconf-screenshots/dbconfig-common_used_for_remote_db.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>Unlike other debconf prompts, you cannot pre-seed the answers
     for the <systemitem class="library">dbconfig-common</systemitem>
     prompts by using <command>debconf-set-selections</command>. Instead, you
@@ -68,40 +72,76 @@ dbc_authmethod_user=''</programlisting>
     file.</para>
   <para>The following screens are in the <systemitem class="service">cinder-common</systemitem>
     package.</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="40"
+        <imagedata scale="40" fileref="figures/debconf-screenshots/dbconfig-common_1_configure-with-dbconfig-yes-no.png"/>
-        fileref="figures/debconf-screenshots/dbconfig-common_1_configure-with-dbconfig-yes-no.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="40"
+        <imagedata scale="40" fileref="figures/debconf-screenshots/dbconfig-common_2_db-types.png"/>
-        fileref="figures/debconf-screenshots/dbconfig-common_2_db-types.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="40"
+        <imagedata scale="40" fileref="figures/debconf-screenshots/dbconfig-common_3_connection_method.png"/>
-        fileref="figures/debconf-screenshots/dbconfig-common_3_connection_method.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="40"
+        <imagedata scale="40" fileref="figures/debconf-screenshots/dbconfig-common_4_mysql_root_password.png"/>
-        fileref="figures/debconf-screenshots/dbconfig-common_4_mysql_root_password.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="40"
+        <imagedata scale="40" fileref="figures/debconf-screenshots/dbconfig-common_5_mysql_app_password.png"/>
-        fileref="figures/debconf-screenshots/dbconfig-common_5_mysql_app_password.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="40"
+        <imagedata scale="40" fileref="figures/debconf-screenshots/dbconfig-common_6_mysql_app_password_confirm.png"/>
-        fileref="figures/debconf-screenshots/dbconfig-common_6_mysql_app_password_confirm.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <para>If you wish to access a MySQL server remotely, you have to make it
+  possible to access it as root from a remote server. This can be done using
+  a simple command available in the <systemitem class="service">openstack-proxy-node</systemitem>
+  package:</para>
+  <screen><prompt>#</prompt> <userinput>/usr/share/openstack-proxy-node/mysql-remote-root</userinput></screen>
+  <para>If you do not want to install the
+  <systemitem class="service">openstack-proxy-node</systemitem>, you can run
+  the following script to enable remote root access:</para>
+  <programlisting language="bash">#!/bin/sh
+
+set -e
+
+SQL="mysql --defaults-file=/etc/mysql/debian.cnf -Dmysql -e"
+
+ROOT_PASS=`${SQL} "SELECT Password FROM user WHERE User='root' LIMIT 1;" \
+  | tail -n 1`
+${SQL} "REPLACE INTO user SET host='%', user='root',\
+  password='${ROOT_PASS}', Select_priv='Y', Insert_priv='Y',\
+  Update_priv='Y', Delete_priv='Y', Create_priv='Y', Drop_priv='Y',\
+  Reload_priv='Y', Shutdown_priv='Y', Process_priv='Y',  File_priv='Y',\
+  Grant_priv='Y', References_priv='Y', Index_priv='Y', Alter_priv='Y',\
+  Super_priv='Y', Show_db_priv='Y', Create_tmp_table_priv='Y',\
+  Lock_tables_priv='Y', Execute_priv='Y', Repl_slave_priv='Y',\
+  Repl_client_priv='Y', Create_view_priv='Y', Show_view_priv='Y',\
+  Create_routine_priv='Y', Alter_routine_priv='Y', Create_user_priv='Y',\
+  Event_priv='Y', Trigger_priv='Y' "
+${SQL} "FLUSH PRIVILEGES"
+sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/mysql/my.cnf
+/etc/init.d/mysql restart</programlisting>
+  <para>You will need to  enable remote access before installation of any OpenStack service.</para>
 </section>

doc/install-guide/section_debconf-keystone_authtoken.xml

@@ -3,7 +3,7 @@
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
-  <title>Services and keystone_authtoken</title>
+  <title>Services and the [keystone_authtoken]</title>
   <para>Because most OpenStack services must access the Identity
     Service, you must configure the IP address of the
       <code>keystone</code> server to be able to access it. You must
@@ -24,34 +24,34 @@ admin_password = %SERVICE_PASSWORD%</programlisting>
     options.</para>
   <para>The following screens show an example Image Service
     configuration:</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/service_keystone_authtoken_server_hostname.png"/>
-        fileref="figures/debconf-screenshots/service_keystone_authtoken_server_hostname.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/service_keystone_authtoken_admin_tenant_name.png"/>
-        fileref="figures/debconf-screenshots/service_keystone_authtoken_admin_tenant_name.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/service_keystone_authtoken_tenant_admin_user.png"/>
-        fileref="figures/debconf-screenshots/service_keystone_authtoken_tenant_admin_user.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/service_keystone_authtoken_admin_password.png"/>
-        fileref="figures/debconf-screenshots/service_keystone_authtoken_admin_password.png"
-      />
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>This information is stored in the configuration file for each
     service. For example:</para>
   <programlisting os="ubuntu;debian" language="ini">/etc/ceilometer/ceilometer.conf

doc/install-guide/section_debconf-rabbitqm.xml

@@ -3,30 +3,33 @@
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
-  <title>RabbitMQ parameters</title>
+  <title>RabbitMQ credentials parameters</title>
   <para>For every package that must connect to a Messaging Server, the
     Debian package enables you to configure the IP address for that
     server and the user name and password that is used to connect. The
     following example shows configuration with the <systemitem
       class="service">ceilometer-common</systemitem> package:</para>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/rabbitmq-host.png"/>
-        fileref="figures/debconf-screenshots/rabbitmq-host.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/rabbitmq-user.png"/>
-        fileref="figures/debconf-screenshots/rabbitmq-user.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
+  <informalfigure>
     <mediaobject>
       <imageobject>
-      <imagedata scale="50"
+        <imagedata scale="50" fileref="figures/debconf-screenshots/rabbitmq-password.png"/>
-        fileref="figures/debconf-screenshots/rabbitmq-password.png"/>
       </imageobject>
     </mediaobject>
+  </informalfigure>
   <para>These debconf screens appear in: <systemitem class="service"
       >ceilometer-common</systemitem>, <systemitem class="service"
       >cinder-common</systemitem>, <systemitem class="service"

doc/install-guide/section_glance-install.xml

@@ -24,17 +24,18 @@
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-glance</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-glance python-glanceclient</userinput></screen></step>
 
-    <step os="debian"><para>Answer to the <systemitem class="library">debconf</systemitem> prompts to setup the
+    <step os="debian"><para>Answer to the <systemitem class="library">debconf</systemitem>
-    database, register the Image service into the Identity service
+    prompts about the <link linkend="debconf-dbconfig-common">database management</link>,
-    catalogue (API endpoint), configure the <code>keystone_authtoken</code>,
+    the <link linkend="debconf-keystone_authtoken"><literal>[keystone_authtoken]</literal>
-    and the RabbitMQ credentials. You will also have to select the type
+    settings</link>, the <link linkend="debconf-rabbitqm">RabbitMQ credentials</link> and
-    of caching as per the screenshot below:
+    the <link linkend="debconf-api-endpoints">API endpoint</link> registration.
+    You will also have to select the type of caching as per the screenshot below:</para>
         <mediaobject>
           <imageobject>
             <imagedata scale="50" fileref="figures/debconf-screenshots/glance-common_pipeline_flavor.png"/>
           </imageobject>
         </mediaobject>
-    </para></step>
+    </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu"><para>The Image
         Service stores information about images in a database.  This
         guide uses the MySQL database that is used by other OpenStack

doc/install-guide/section_heat-install.xml

@@ -8,9 +8,12 @@
       <para>Install the Orchestration Service on the controller node:</para>
       <screen os="debian"><prompt>#</prompt> <userinput>apt-get install heat-api heat-api-cfn heat-engine</userinput></screen>
     </step>
-    <step><para>Answer to the <systemitem class="library">debconf</systemitem>
+    <step>
-    prompts about the database, the RabbitMQ and the
+      <para>Answer to the <systemitem class="library">debconf</systemitem>
-    <code>keystone_authtoken</code> configuration, and the API endpoint registration.</para>
+      prompts about the <link linkend="debconf-dbconfig-common">database management</link>,
+      the <link linkend="debconf-keystone_authtoken"><literal>[keystone_authtoken]</literal>
+      settings</link>, the <link linkend="debconf-rabbitqm">RabbitMQ credentials</link> and
+      the <link linkend="debconf-api-endpoints">API endpoint</link> registration.</para>
     </step>
   </procedure>
   <procedure os="rhel;centos;fedora;opensuse;sles;ubuntu">

doc/install-guide/section_neutron-install.xml

@@ -218,10 +218,11 @@ IDENTIFIED BY '<replaceable>NEUTRON_DBPASS</replaceable>';</userinput></screen>
         <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-neutron openstack-neutron-l3-agent openstack-neutron-dhcp-agent</userinput></screen>
       </step>
       <step os="debian">
-        <para>Response to the <systemitem class="library"
+        <para>Answer to the <systemitem class="library">debconf</systemitem>
-            >debconf</systemitem> prompts to set up the database,
+        prompts about the <link linkend="debconf-dbconfig-common">database management</link>,
-            <literal>[keystone_authtoken]</literal>, RabbitMQ
+        the <link linkend="debconf-keystone_authtoken"><literal>[keystone_authtoken]</literal>
-          credentials, and API endpoints.</para>
+        settings</link>, the <link linkend="debconf-rabbitqm">RabbitMQ credentials</link> and
+        the <link linkend="debconf-api-endpoints">API endpoint</link> registration.</para>
       </step>
       <step os="rhel;centos;fedora;opensuse;sles">
         <para>Make sure basic Neutron-related service are set to start

doc/install-guide/section_neutron-provider-router-with-private_networks.xml

@@ -568,11 +568,13 @@ export SERVICE_TOKEN=password</programlisting></para>
             that the administrator would create the private networks on behalf of the tenants.
         </para>
         <para>
+          <informalfigure>
             <mediaobject>
                 <imageobject>
                     <imagedata scale="55" fileref="../common/figures/UseCase-SingleRouter.png"/>
                 </imageobject>
             </mediaobject>
+          </informalfigure>
             <!--Image source link: https://docs.google.com/a/nicira.com/drawings/d/1DKxeZZXml_fNZHRoGPKkC7sGdkPJZCtWytYZqHIp_ZE/edit -->
         </para>
     </section>

doc/install-guide/section_nova-compute.xml

@@ -49,38 +49,31 @@
 
     <step><para>After configuring the operating system, install the appropriate
       packages for the compute service.</para>
-      <note os="debian"><title>Note for Debian users</title>
-      <para>Before installing anything, make sure that you have installed dbconfig-common, and that
-      you configured it correctly to allow the use of remote database servers:</para>
-      <screen><prompt>#</prompt> <userinput>dpkg-reconfigure dbconfig-common</userinput></screen>
-      <para>Then, on the host running the MySQL server (which is the controller
-      node in this manual), simply run:
-      <screen><prompt>#</prompt> <userinput>/usr/share/openstack-proxy-node/mysql-remote-root</userinput></screen>
-      (available from the openstack-proxy-node package) so that your
-      controller node is configured to allow the compute node to access it.</para>
-      </note>
       <para os="ubuntu;debian">Then do:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install nova-compute-kvm python-guestfs</userinput></screen>
       <para os="ubuntu;debian">Select "Yes" when asked to create a supermin appliance during install.</para>
-      <note os="debian"><title>Note for Debian users</title>
+
-      <para>You can also use the meta-package with:
+      <note os="debian">
+      <para>In Debian, you can also use the meta-packages with the following command:
       <screen><prompt>#</prompt> <userinput>apt-get install openstack-compute-node</userinput></screen>
       which will also install other components on your compute node, like the OVS
-      Neutron agent, Ceilometer agent, and more.</para>
+      Neutron agent, Ceilometer agent, and more. There is also a
-      <para>As for the rest of OpenStack, the Nova packages are configured through
+      meta-package for the controler node called
-      debconf. So you will not need to manually configure the database, do the
+      <systemitem class="library">openstack-proxy-node</systemitem> and a meta-package
-      "nova-manage db sync" manually, configure the keystone auth token, or
+      called <systemitem class="library">openstack-toaster</systemitem> that
-      the RabbitMQ parameters of Nova. Therefore, all the below steps can be
+      installs both <systemitem class="library">openstack-proxy-node</systemitem> and
-      skipped. If you need to reconfigure Nova, you can use:
+      <systemitem class="library">openstack-toaster</systemitem> at the same time.</para></note>
-      <screen><prompt>#</prompt> <userinput>dpkg-reconfigure -plow nova-common</userinput></screen>
+
-      or edit the configuration files and manually restart the daemons.
-      Remember that if your database server is installed remotely, before
-      installing the Compute service, you will need to do:
-      <screen><prompt>#</prompt> <userinput>apt-get install dbconfig-common &amp;&amp; dpkg-reconfigure -plow dbconfig-common</userinput></screen></para></note>
       <screen os="centos;rhel;fedora"><prompt>#</prompt> <userinput>yum install openstack-nova-compute</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-nova-compute kvm openstack-utils</userinput></screen>
     </step>
-    <step os="ubuntu;debian">
+    <step os="debian"><para>Answer to the <systemitem class="library">debconf</systemitem>
+    prompts about the <link linkend="debconf-dbconfig-common">database management</link>,
+    the <link linkend="debconf-keystone_authtoken"><literal>[keystone_authtoken]</literal>
+    settings</link>, the <link linkend="debconf-rabbitqm">RabbitMQ credentials</link> and
+    the <link linkend="debconf-api-endpoints">API endpoint</link> registration.</para>
+    </step>
+    <step os="ubuntu">
     <para>Due to <link xlink:href="https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725">this bug</link>
     that is marked "Won't Fix", guestfs is restricted.
     Run the following command to relax the restriction:</para>
@@ -122,7 +115,7 @@ rabbit_host = controller</programlisting>
 
 </step>
 
-<step os="ubuntu;debian">
+<step os="ubuntu">
 <para>Remove the SQLite Database created by the packages</para>
 <screen><prompt>#</prompt> <userinput>rm /var/lib/nova/nova.sqlite</userinput></screen>
 </step>

doc/install-guide/section_nova-controller.xml

@@ -38,10 +38,11 @@
   </step>
 
   <step os="debian"><para>Answer to the <systemitem class="library">debconf</systemitem>
-  prompts to configure the Nova Controller Services. This includes configuring the database,
+    prompts about the <link linkend="debconf-dbconfig-common">database management</link>,
-  the <code>keystone_autotoken</code>, the RabbitMQ credentials, and registering
+    the <link linkend="debconf-keystone_authtoken"><literal>[keystone_authtoken]</literal>
-  <systemitem class="service">nova-api</systemitem> in the Keystone catalogue.
+    settings</link>, the <link linkend="debconf-rabbitqm">RabbitMQ credentials</link> and
-  The <code>nova-manage db sync</code> will then be done for you automatically.</para>
+    the <link linkend="debconf-api-endpoints">API endpoint</link> registration.
+    The <command>nova-manage db sync</command> will then be done for you automatically.</para>
   </step>
 
   <step os="rhel;centos;fedora;opensuse;sles;ubuntu">