ソースを参照

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 <madhu@docker.com>
Madhu Venugopal 10 年 前
コミット
7084bc27f9
1 ファイル変更1 行追加1 行削除
  1. 1 1
      libnetwork/controller.go

+ 1 - 1
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
 	}