Merge pull request #320 from mavenugo/master

set the kv-provider driver labels only if it is a valid config
This commit is contained in:
Jana Radhakrishnan
2015-06-19 06:51:33 -07:00
+1 -1
View File
@@ -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
}