summaryrefslogtreecommitdiff
path: root/qpid/doc
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-12-14 15:30:40 +0000
committerAlan Conway <aconway@apache.org>2012-12-14 15:30:40 +0000
commit720214353e61cc171aadcc3e18c4edad9facfa9c (patch)
tree595494431ffe571a6880a5b11b806f91e533813d /qpid/doc
parent7ace74f35ce8d8b4788d7aa1545a541de04ad451 (diff)
downloadqpid-python-720214353e61cc171aadcc3e18c4edad9facfa9c.tar.gz
QPID-4506: Qpid HA's '--ha-public-url' option duplicates the '--known-hosts-url' option but cannot be disabled
Reverts the previous commit and simplifies the semantics of setting --ha-public-url and --ha-brokers-url. There is no longer any over-riding or implicit updating of values. That means you must set --ha-public-url as well as --ha-brokers-url, it will not be defaulted. Likewise if you *dont* set ha-public-url, it will remain empty, which is the use case in this bug. The defaulting was adding complexity without adding much value. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1421934 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/doc')
-rw-r--r--qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml19
1 files changed, 11 insertions, 8 deletions
diff --git a/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
index be5cb14a61..55893387a4 100644
--- a/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
+++ b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
@@ -288,8 +288,7 @@ ssl_addr = "ssl:" host [":" port]'
</footnote>
used by cluster brokers to connect to each other. The URL should
contain a comma separated list of the broker addresses, rather than a
- virtual IP address. For example:
- <literal>amqp:node1.exaple.com,node2.exaple.com,node3.exaple.com</literal>
+ virtual IP address.
</para>
</entry>
</row>
@@ -297,14 +296,18 @@ ssl_addr = "ssl:" host [":" port]'
<entry><literal>ha-public-url <replaceable>URL</replaceable></literal> </entry>
<entry>
<para>
- The URL <footnoteref linkend="ha-url-grammar"/> used by clients to connect to the cluster. This can be a list or
- a single virtual IP address. A virtual IP address is recommended as it
- simplifies deployment. If not specified this defaults to the value of
- <literal>ha-brokers-url</literal>.
+ The URL <footnoteref linkend="ha-url-grammar"/> is advertised to
+ clients as the "known-hosts" for fail-over. It can be a list or
+ a single virtual IP address. A virtual IP address is recommended.
</para>
<para>
- This option allows you to put client traffic on a different network from
- broker traffic, which is recommended.
+ Using this option you can put client and broker traffic on
+ separate networks, which is recommended.
+ </para>
+ <para>
+ Note: When HA clustering is enabled the broker option
+ <literal>known-hosts-url</literal> is ignored and over-ridden by
+ the <literal>ha-public-url</literal> setting.
</para>
</entry>
</row>