diff --git a/doc/config-reference/bk-config-ref.xml b/doc/config-reference/bk-config-ref.xml
index 9c0f1f800c..49092e0d76 100644
--- a/doc/config-reference/bk-config-ref.xml
+++ b/doc/config-reference/bk-config-ref.xml
@@ -109,6 +109,8 @@
     <xi:include href="ch_computeconfigure.xml"/>
     <!-- Dashboard -->
     <xi:include href="ch_dashboardconfigure.xml"/>
+    <!-- Database Service -->
+    <xi:include href="ch_databaseserviceconfigure.xml"/>
     <!-- Identity -->
     <xi:include href="ch_identityconfigure.xml"/>
     <!-- Image -->
diff --git a/doc/config-reference/ch_config-overview.xml b/doc/config-reference/ch_config-overview.xml
index 080290938b..b2e9e6dbc3 100644
--- a/doc/config-reference/ch_config-overview.xml
+++ b/doc/config-reference/ch_config-overview.xml
@@ -13,13 +13,15 @@
         the following OpenStack components:
    </para>
     <itemizedlist>
-        <listitem><para>OpenStack Identity</para></listitem>
+        <listitem><para>OpenStack Block Storage</para></listitem>
         <listitem><para>OpenStack Compute</para></listitem>
+        <listitem><para>OpenStack Dashboard</para></listitem>
+        <listitem><para>Database Service</para></listitem>
+        <listitem><para>OpenStack Identity</para></listitem>
         <listitem><para>OpenStack Image Service</para></listitem>
         <listitem><para>OpenStack Networking</para></listitem>
-        <listitem><para>OpenStack Dashboard</para></listitem>
         <listitem><para>OpenStack Object Storage</para></listitem>
-        <listitem><para>OpenStack Block Storage</para></listitem>
+        <listitem><para>Telemetry</para></listitem>
     </itemizedlist>
     <xi:include href="../common/section_conventions.xml"/>
     <xi:include href="../common/section_dochistory.xml"/>
diff --git a/doc/config-reference/ch_databaseserviceconfigure.xml b/doc/config-reference/ch_databaseserviceconfigure.xml
new file mode 100644
index 0000000000..0e90cdb9dc
--- /dev/null
+++ b/doc/config-reference/ch_databaseserviceconfigure.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="ch_configuring-trove"
+  xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:ns5="http://www.w3.org/1999/xhtml"
+  xmlns:ns4="http://www.w3.org/2000/svg"
+  xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+  xmlns:ns="http://docbook.org/ns/docbook">
+  <title>Database Service</title>
+  <para>The Database Service provides a scalable and reliable Cloud
+  Database-as-a-Service functionality for both relational and
+  non-relational database engines.</para>
+
+  <para>The following tables provide a comprehensive list of the
+      Database Service configuration options.</para>
+
+      <xi:include href="../common/tables/trove-api.xml"/>
+      <xi:include href="../common/tables/trove-backup.xml"/>
+      <xi:include href="../common/tables/trove-common.xml"/>
+      <xi:include href="../common/tables/trove-compute.xml"/>
+      <xi:include href="../common/tables/trove-debug.xml"/>
+      <xi:include href="../common/tables/trove-dns.xml"/>
+      <xi:include href="../common/tables/trove-guestagent.xml"/>
+      <xi:include href="../common/tables/trove-heat.xml"/>
+      <xi:include href="../common/tables/trove-logging.xml"/>
+      <xi:include href="../common/tables/trove-nova.xml"/>
+      <xi:include href="../common/tables/trove-quota.xml"/>
+      <xi:include href="../common/tables/trove-redis.xml"/>
+      <xi:include href="../common/tables/trove-ssl.xml"/>
+      <xi:include href="../common/tables/trove-swift.xml"/>
+      <xi:include href="../common/tables/trove-taskmanager.xml"/>
+      <xi:include href="../common/tables/trove-volume.xml"/>
+
+      <xi:include href="database-service/section-databaseservice-db.xml"/>
+      <xi:include href="database-service/section-databaseservice-rpc.xml"/>
+</chapter>
diff --git a/doc/config-reference/database-service/section-databaseservice-db.xml b/doc/config-reference/database-service/section-databaseservice-db.xml
new file mode 100644
index 0000000000..85a60fbef3
--- /dev/null
+++ b/doc/config-reference/database-service/section-databaseservice-db.xml
@@ -0,0 +1,22 @@
+<section xml:id="database-configuring-db"
+    xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:ns5="http://www.w3.org/1999/xhtml"
+    xmlns:ns4="http://www.w3.org/2000/svg"
+    xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+    xmlns:ns="http://docbook.org/ns/docbook"
+    version="5.0">
+  <?dbhtml stop-chunking?>
+   <title>Configure the database</title>
+
+   <para>Use the options to configure the used databases:</para>
+
+   <xi:include href="../../common/tables/trove-database.xml"/>
+   <xi:include href="../../common/tables/trove-db_cassandra.xml"/>
+   <xi:include href="../../common/tables/trove-db_couchbase.xml"/>
+   <xi:include href="../../common/tables/trove-db_mongodb.xml"/>
+   <xi:include href="../../common/tables/trove-db_mysql.xml"/>
+   <xi:include href="../../common/tables/trove-db_percona.xml"/>
+   <xi:include href="../../common/tables/trove-db_redis.xml"/>
+</section>
diff --git a/doc/config-reference/database-service/section-databaseservice-rpc.xml b/doc/config-reference/database-service/section-databaseservice-rpc.xml
new file mode 100644
index 0000000000..ce68e8c5ac
--- /dev/null
+++ b/doc/config-reference/database-service/section-databaseservice-rpc.xml
@@ -0,0 +1,52 @@
+<section xml:id="database-configuring-rpc"
+    xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:ns5="http://www.w3.org/1999/xhtml"
+    xmlns:ns4="http://www.w3.org/2000/svg"
+    xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+    xmlns:ns="http://docbook.org/ns/docbook"
+    version="5.0">
+  <?dbhtml stop-chunking?>
+   <title>Configure the RPC messaging system</title>
+   <para>OpenStack projects use an open standard for messaging
+    middleware known as AMQP. This messaging middleware enables the
+    OpenStack services that run on multiple servers to talk to each
+    other. OpenStack Trove RPC supports three implementations of AMQP:
+      <application>RabbitMQ</application>,
+      <application>Qpid</application>, and
+      <application>ZeroMQ</application>.</para>
+
+      <section xml:id="database-configure-rabbitmq">
+        <title>Configure RabbitMQ</title>
+        <para>Use these options to configure the
+        <application>RabbitMQ</application> messaging system:
+        </para>
+        <xi:include href="../../common/tables/trove-rabbitmq.xml"/>
+      </section>
+      <section xml:id="database-configure-qpid">
+        <title>Configure Qpid</title>
+        <para>Use these options to configure the
+        <application>Qpid</application> messaging system:
+        </para>
+        <xi:include href="../../common/tables/trove-qpid.xml"/>
+      </section>
+      <section xml:id="database-configure-zeromq">
+        <title>Configure ZeroMq</title>
+        <para>Use these options to configure the
+        <application>ZeroMq</application> messaging system:
+        </para>
+        <xi:include href="../../common/tables/trove-zeromq.xml"/>
+      </section>
+      <section xml:id="database-common-messaging-configuration">
+        <title>Configure messaging</title>
+
+        <para>Use these common options to configure the
+        <application>RabbitMQ</application>,
+        <application>Qpid</application>, and
+        <application>ZeroMq</application> messaging drivers:</para>
+
+        <xi:include href="../../common/tables/trove-amqp.xml"/>
+        <xi:include href="../../common/tables/trove-rpc.xml"/>
+      </section>
+</section>