diff options
| author | Tommi Virtanen <tv@eagain.net> | 2011-11-21 22:32:45 +0100 |
|---|---|---|
| committer | Tommi Virtanen <tv@eagain.net> | 2011-11-21 23:27:45 +0100 |
| commit | c066e92638733d19aea8da6a70d26509e033f6a1 (patch) | |
| tree | 5426b3486c496a7eab1cba135e0c38e37a92e597 /src/ceph_syn.cc | |
| parent | common/pickaddr: Pick cluster_addr/public_addr based on *_network. (diff) | |
| download | ceph-c066e92638733d19aea8da6a70d26509e033f6a1.tar.xz ceph-c066e92638733d19aea8da6a70d26509e033f6a1.zip | |
mds, osd, synclient: Pick cluster_addr/public_addr based on *_network.
Instead of specifying an IP address in ceph.conf like
[global]
cluster_addr = 10.1.2.3
you can now avoid the node-specific configuration and just say
[global]
cluster_network = 10.1.2.0/24
The *_network variables can also take a whitespace-separated list of
networks, to be checked in that order:
[global]
cluster_network = 10.1.2.0/24 192.168.42.192/26
Diffstat (limited to 'src/ceph_syn.cc')
| -rw-r--r-- | src/ceph_syn.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc index 09ab7db1c28..428724fc92c 100644 --- a/src/ceph_syn.cc +++ b/src/ceph_syn.cc @@ -29,6 +29,7 @@ using namespace std; #include "common/Timer.h" #include "global/global_init.h" #include "common/ceph_argparse.h" +#include "common/pick_address.h" #if !defined(DARWIN) && !defined(__FreeBSD__) #include <envz.h> @@ -51,6 +52,8 @@ int main(int argc, const char **argv, char *envp[]) parse_syn_options(args); // for SyntheticClient + pick_addresses(g_ceph_context); + vec_to_argv(args, argc, argv); // get monmap |