Commit 695ec30e authored by Andrei Pavel's avatar Andrei Pavel

Merge branch 'cassandra-host-data-source' into cassandra-host-data-source-stress-test

parents b688eb54 42de10a2
......@@ -123,7 +123,7 @@ We have received the following contributions:
- Andrei Pavel, Qualitance
2016-10: Support for DHCPv6 options defined in RFC6603 and RFC7598
2016-12: Cassandra Host Data Source
2017-01: Cassandra Host Data Source
- Vincent Legout
2016-11: Fixed serveral spelling mistakes
......
......@@ -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:
......@@ -3097,9 +3109,6 @@ If not specified, the default value is:
src/lib/dhcpsrv/cfg_host_operations.cc -->
</para>
</section>
</section>
......
......@@ -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>
......@@ -4076,7 +4084,6 @@ If not specified, the default value is:
<xref linkend="command-shutdown" />, respectively.</para>
</section>
<section>
<title>User context in IPv6 pools</title>
<para>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment