From 4d0a4f8b022953c4cec7c60ce452a36457519a76 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin.lu@huawei.com>
Date: Thu, 31 Aug 2017 17:33:12 -0400
Subject: [PATCH] Make docker cluster store point to right cluster

Devstack set the docker cluster store to point to the etcd cluster
in current host. In multinode gate, each node setup an independent
etcd cluster so docker in each host uses an independent store.
This will result in an issue that resources (i.e. network) created
in one node cannot be found in another node.

This commit fix it by making all nodes use the same etcd cluster
in service host.

Partial-Implements: blueprint multi-node-ci
Change-Id: Ieeecc2ef14a1077a2ef91ee369b317f53d7ffb81
---
 devstack/settings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/settings b/devstack/settings
index c3eaa1577..76c847370 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,7 +16,7 @@
 # OVS_PHYSICAL_BRIDGE=br-ex
 
 # Configure Docker cluster store
-DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$HOST_IP:$ETCD_PORT}
+DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-etcd://$SERVICE_HOST:$ETCD_PORT}
 
 # Enable Zun services
 if [[ ${HOST_IP} == ${SERVICE_HOST} ]]; then