Merge pull request #1340 from aboch/restart

Save the controller config on config reload
2016-07-21 15:41:31 -07:00 · 2016-07-21 15:41:31 -07:00 · 605ecdd099
commit 605ecdd099
parent 43df8050ba 47c071b654
1 changed files with 4 additions and 0 deletions
--- a/libnetwork/controller.go
+++ b/libnetwork/controller.go
@ -378,6 +378,10 @@ func (c *controller) ReloadConfiguration(cfgOptions ...config.Option) error {
 		return nil
 	}

+	c.Lock()
+	c.cfg = cfg
+	c.Unlock()
+
 	var dsConfig *discoverapi.DatastoreConfigData
 	for scope, sCfg := range cfg.Scopes {
 		if scope == datastore.LocalScope || !sCfg.IsValid() {