From 7084bc27f96c5e7853376a7c96e764a6e7f48e48 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Fri, 19 Jun 2015 06:30:37 -0700 Subject: [PATCH] set the kv-provider driver labels only if it is a valid config without this fix, overlay driver returns an error and that causes the daemon to quit. Signed-off-by: Madhu Venugopal --- libnetwork/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetwork/controller.go b/libnetwork/controller.go index b110f3b32c..cf0b1c2774 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -211,7 +211,7 @@ func (c *controller) RegisterDriver(networkType string, driver driverapi.Driver, } } - if capability.Scope == driverapi.GlobalScope { + if capability.Scope == driverapi.GlobalScope && c.validateDatastoreConfig() { opt[netlabel.KVProvider] = c.cfg.Datastore.Client.Provider opt[netlabel.KVProviderURL] = c.cfg.Datastore.Client.Address }