Avoid running more than one etcd process

If both Fuxi and Kuryr-libnetwork are enabled in devstack, the script
will fail since etcd-server was spawned twice. This commit added a
check for existing etcd process and spawn one if not existed.

Closes-Bug: #1683852
Change-Id: I4d6806e300d23fa69757cc328f3a0d142ff7b425
This commit is contained in:
Hongbin Lu 2017-04-17 18:24:54 -04:00
parent 976b301db8
commit bed8d3b38c
1 changed files with 1 additions and 1 deletions

View File

@ -103,7 +103,7 @@ if is_service_enabled fuxi; then
configure_fuxi
# Run etcd first
run_process etcd-server "$DEST/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd --data-dir $DEST/etcd/db.etcd --advertise-client-urls http://0.0.0.0:$FUXI_ETCD_PORT --listen-client-urls http://0.0.0.0:$FUXI_ETCD_PORT"
pgrep -x "etcd" >/dev/null || run_process etcd-server "$DEST/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd --data-dir $DEST/etcd/db.etcd --advertise-client-urls http://0.0.0.0:$FUXI_ETCD_PORT --listen-client-urls http://0.0.0.0:$FUXI_ETCD_PORT"
# FIXME(mestery): By default, Ubuntu ships with /bin/sh pointing to
# the dash shell.