From 47c071b654fc1513e76230b15c1140ab5307ab24 Mon Sep 17 00:00:00 2001
From: Alessandro Boch <aboch@docker.com>
Date: Thu, 21 Jul 2016 12:09:07 -0700
Subject: [PATCH] Save the controller config on config reload

Signed-off-by: Alessandro Boch <aboch@docker.com>
---
 libnetwork/controller.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libnetwork/controller.go b/libnetwork/controller.go
index 9bb1c7c5bb..3589535b75 100644
--- 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() {