diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-11 10:41:57 -0700 |
|---|---|---|
| committer | Gerrit Code Review <review@dev.gluster.org> | 2014-03-11 10:41:57 -0700 |
| commit | 1b12ba591bd63f473dfda9f29cb62394dfa6fee4 (patch) | |
| tree | c9d2d91d5579f0a0667d9e0ff9408d5840c2d88c /xlators/mgmt/glusterd/src/glusterd-etcd.c | |
| parent | 87d68c5bbd085b081bb73c4bfd83115db8cdc308 (diff) | |
| parent | d23e33a93ccf46435e4176943da1797b7c142288 (diff) | |
Merge "nsr: update to latest versions of etcd and etcd-api"
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-etcd.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-etcd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-etcd.c b/xlators/mgmt/glusterd/src/glusterd-etcd.c index 3382e20ae..656ea3b9b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-etcd.c +++ b/xlators/mgmt/glusterd/src/glusterd-etcd.c @@ -18,7 +18,7 @@ #include "glusterd-etcd.h" #define GLUSTERD_ETCD_DIR "/var/lib/glusterd/etcd" -#define GLUSTERD_ETCD_CMD "/root/etcd/etcd" +#define GLUSTERD_ETCD_CMD "/root/etcd/bin/etcd" pid_t start_etcd (char *this_host, char *other_host) @@ -40,13 +40,14 @@ start_etcd (char *this_host, char *other_host) runinit (&runner); runner_add_args (&runner, GLUSTERD_ETCD_CMD, - "-n", this_host, "-d", GLUSTERD_ETCD_DIR, - "-c", NULL); + "-name", this_host, + "-data-dir", GLUSTERD_ETCD_DIR, + "-bind-addr", NULL); runner_argprintf( &runner, "%s:4001", me); - runner_add_arg (&runner, "-s"); + runner_add_arg (&runner, "-peer-addr"); runner_argprintf (&runner, "%s:7001", me); if (other_host) { - runner_add_arg (&runner, "-C"); + runner_add_arg (&runner, "-peers"); runner_argprintf (&runner, "%s:7001", other_host); gf_log (__func__, GF_LOG_INFO, "starting etcd via %s", other_host); } else { |