Documented Cassandra configuration

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index c2798e7a023faa96117332307d5314f2e3237111..49508011beadbe73db4bf60e9033a488afedeb25 100644 (file)
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -436,17 +436,29 @@ be followed by a comma and another object definition.</para>
   <xref linkend="cql-database-create"/>).
 <screen>
 "Dhcp4": { "lease-database": { <userinput>"name": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... }
+</screen>
+  For Cassandra:
+<screen>
+"Dhcp4": { "lease-database": { <userinput>"keyspace": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... }
 </screen>
   If the database is located on a different system to the DHCPv4 server, the
   database host name must also be specified. (It should be noted that this
   configuration may have a severe impact on server performance.):
 <screen>
-"Dhcp4": { "lease-database": { <userinput>"host": <replaceable>remote-host-name</replaceable></userinput>, ... }, ... }
+"Dhcp4": { "lease-database": { <userinput>"host": "<replaceable>remote-host-name</replaceable>"</userinput>, ... }, ... }
+</screen>
+  For Cassandra, multiple contact points can be provided:
+<screen>
+"Dhcp4": { "lease-database": { <userinput>"contact_points": "<replaceable>remote-host-name[, ...] </replaceable>"</userinput>, ... }, ... }
 </screen>
   The usual state of affairs will be to have the database on the same machine as
   the DHCPv4 server.  In this case, set the value to the empty string:
 <screen>
 "Dhcp4": { "lease-database": { <userinput>"host" : ""</userinput>, ... }, ... }
+</screen>
+  For Cassandra:
+<screen>
+"Dhcp4": { "lease-database": { <userinput>"contact_points": ""</userinput>, ... }, ... }
 </screen>
   Should the database be located on a different system, you may need to specify a longer interval
   for the connection timeout:
@@ -2996,7 +3008,6 @@ It is merely echoed by the server
       Cassandra (CQL).</para>
     </section>
 
-
     <section id="reservations4-tuning">
       <title>Fine Tuning DHCPv4 Host Reservation</title>
 
@@ -3105,9 +3116,6 @@ If not specified, the default value is:
 src/lib/dhcpsrv/cfg_host_operations.cc -->
 
 </para>
-
-
-
    </section>
 
   </section>

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 9c7ca469ce5a273b1123bfae8fe13fc339e08c2a..5492ff222967ad6072055f3d4df6e4e034de0807 100644 (file)
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -431,17 +431,29 @@ be followed by a comma and another object definition.</para>
   or <xref linkend="cql-database-create"/>).
 <screen>
 "Dhcp6": { "lease-database": { <userinput>"name": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... }
+</screen>
+  For Cassandra:
+<screen>
+"Dhcp6": { "lease-database": { <userinput>"keyspace": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... }
 </screen>
   If the database is located on a different system to the DHCPv6 server, the
   database host name must also be specified. (It should be noted that this
   configuration may have a severe impact on server performance.):
 <screen>
-"Dhcp6": { "lease-database": { <userinput>"host": <replaceable>remote-host-name</replaceable></userinput>, ... }, ... }
+"Dhcp6": { "lease-database": { <userinput>"host": "<replaceable>remote-host-name</replaceable>"</userinput>, ... }, ... }
+</screen>
+  For Cassandra, multiple contact points can be provided:
+<screen>
+"Dhcp6": { "lease-database": { <userinput>"contact_points": "<replaceable>remote-host-name[, ...]</replaceable>" </userinput>, ... }, ... }
 </screen>
   The usual state of affairs will be to have the database on the same machine as
   the DHCPv6 server.  In this case, set the value to the empty string:
 <screen>
 "Dhcp6": { "lease-database": { <userinput>"host" : ""</userinput>, ... }, ... }
+</screen>
+  For Cassandra:
+<screen>
+"Dhcp6": { "lease-database": { <userinput>"contact_points": ""</userinput>, ... }, ... }
 </screen>
   Should the database be located on a different system, you may need to specify a longer interval
   for the connection timeout:
@@ -556,7 +568,6 @@ for MySQL and PostgreSQL databases.</para></note>
 
 </section>
 
-
 <section id="dhcp6-interface-selection">
   <title>Interface Selection</title>
   <para>The DHCPv6 server has to be configured to listen on specific network
@@ -956,7 +967,6 @@ temporarily override a list of interface names and listen on all interfaces.
         <xref linkend="dhcp6-option-data-defaults"/>.
       </para>
 
-
     <para>
       It is possible to override options on a per-subnet basis.  If
       clients connected to most of your subnets are expected to get the
@@ -1073,7 +1083,6 @@ temporarily override a list of interface names and listen on all interfaces.
         no means to validate the format at the moment.
       </para>
 
-
     <para>
       <table frame="all" id="dhcp6-std-options-list">
         <title>List of Standard DHCPv6 Options</title>
@@ -2127,7 +2136,6 @@ should include options from the isc option space:
       </itemizedlist>
       </para>
 
-
       <section id="dhcpv6-d2-io-config">
       <title>DHCP-DDNS Server Connectivity</title>
       <para>
@@ -4082,7 +4090,6 @@ If not specified, the default value is:
       <xref linkend="command-shutdown" />, respectively.</para>
     </section>
 
-
       <section>
         <title>User context in IPv6 pools</title>
         <para>