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 @@
+
+
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:
- OpenStack Identity
+ OpenStack Block Storage
OpenStack Compute
+ OpenStack Dashboard
+ Database Service
+ OpenStack Identity
OpenStack Image Service
OpenStack Networking
- OpenStack Dashboard
OpenStack Object Storage
- OpenStack Block Storage
+ Telemetry
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 @@
+
+
+ Database Service
+ The Database Service provides a scalable and reliable Cloud
+ Database-as-a-Service functionality for both relational and
+ non-relational database engines.
+
+ The following tables provide a comprehensive list of the
+ Database Service configuration options.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+ Configure the database
+
+ Use the options to configure the used databases:
+
+
+
+
+
+
+
+
+
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 @@
+
+
+ Configure the RPC messaging system
+ 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:
+ RabbitMQ,
+ Qpid, and
+ ZeroMQ.
+
+
+ Configure RabbitMQ
+ Use these options to configure the
+ RabbitMQ messaging system:
+
+
+
+
+ Configure Qpid
+ Use these options to configure the
+ Qpid messaging system:
+
+
+
+
+ Configure ZeroMq
+ Use these options to configure the
+ ZeroMq messaging system:
+
+
+
+
+ Configure messaging
+
+ Use these common options to configure the
+ RabbitMQ,
+ Qpid, and
+ ZeroMq messaging drivers:
+
+
+
+
+