From 72e389903a2fd7583f2ba9d5d8d98a2c3c63354b Mon Sep 17 00:00:00 2001 From: Liping Mao Date: Mon, 29 Aug 2016 23:35:22 +0800 Subject: [PATCH] kuryr-server process does not start up with devstack Change-Id: I8d6f2f05e616ca7c2526891877fbfd43312d43df Closes-bug: #1618104 --- devstack/plugin.sh | 4 ++-- devstack/settings | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 9d4f4a3e..ef9ed55a 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -129,14 +129,14 @@ if is_service_enabled kuryr-libnetwork; then # If Kuryr start up in "post-config" phase, there is no way to make sure # Kuryr can start before neutron-server, so Kuryr start in "extra" phase. # Bug: https://bugs.launchpad.net/kuryr/+bug/1587522 - run_process kuryr "sudo PYTHONPATH=$PYTHONPATH:$DEST/kuryr SERVICE_USER=admin SERVICE_PASSWORD=$SERVICE_PASSWORD SERVICE_TENANT_NAME=admin SERVICE_TOKEN=$SERVICE_TOKEN IDENTITY_URL=http://127.0.0.1:5000/v2.0 python $DEST/kuryr-libnetwork/scripts/run_server.py --config-file /etc/kuryr/kuryr.conf" + run_process kuryr-libnetwork "sudo PYTHONPATH=$PYTHONPATH:$DEST/kuryr SERVICE_USER=admin SERVICE_PASSWORD=$SERVICE_PASSWORD SERVICE_TENANT_NAME=admin SERVICE_TOKEN=$SERVICE_TOKEN IDENTITY_URL=http://127.0.0.1:5000/v2.0 python $DEST/kuryr-libnetwork/scripts/run_server.py --config-file /etc/kuryr/kuryr.conf" neutron subnetpool-create --default-prefixlen $KURYR_POOL_PREFIX_LEN --pool-prefix $KURYR_POOL_PREFIX kuryr fi if [[ "$1" == "unstack" ]]; then - stop_process kuryr + stop_process kuryr-libnetwork stop_process etcd-server stop_process docker-engine fi diff --git a/devstack/settings b/devstack/settings index 400466cb..026ed78b 100644 --- a/devstack/settings +++ b/devstack/settings @@ -18,5 +18,5 @@ KURYR_CONFIG=${KURYR_CONFIG_DIR}/${KURYR_CONFIG_FILENAME} KURYR_POOL_PREFIX=${KURYR_POOL_PREFIX:-10.10.0.0/16} KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24} -KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-23750} +KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375} KURYR_ETCD_PORT=${KURYR_ETCD_PORT:-4001}