Merge remote-tracking branch 'meejah/2916.grid-manager-proposal.5' into 2916.grid-manager-proposal.6

src/allmydata/client.py

@@ -12,7 +12,11 @@ if PY2:
     # Don't use future str to prevent leaking future's newbytes into foolscap, which they break.
     from past.builtins import unicode as str
 
-import os, stat, time, weakref
+import os
+import stat
+import time
+import weakref
+
 from base64 import urlsafe_b64encode
 from functools import partial
 # On Python 2 this will be the backported package:
@@ -34,6 +38,7 @@ from twisted.application.internet import TimerService
 from twisted.python.filepath import FilePath
 
 import allmydata
+from allmydata import node
 from allmydata.crypto import rsa, ed25519
 from allmydata.crypto.util import remove_prefix
 from allmydata.storage.server import StorageServer, FoolscapStorageServer
@@ -63,7 +68,6 @@ from allmydata.interfaces import (
 )
 from allmydata.nodemaker import NodeMaker
 from allmydata.blacklist import Blacklist
-from allmydata import node
 
 
 KiB=1024
@@ -97,6 +101,8 @@ _client_config = configutil.ValidConfiguration(
             "shares.total",
             "storage.plugins",
         ),
+        "grid_managers": None,  # means "any options valid"
+        "grid_manager_certificates": None,
         "storage": (
             "debug_discard",
             "enabled",
@@ -112,6 +118,7 @@ _client_config = configutil.ValidConfiguration(
             "reserved_space",
             "storage_dir",
             "plugins",
+            "grid_management",
         ),
         "sftpd": (
             "accounts.file",
@@ -495,6 +502,7 @@ def create_storage_farm_broker(config, default_connection_handlers, foolscap_con
             **kwargs
         )
 
+    # create the actual storage-broker
     sb = storage_client.StorageFarmBroker(
         permute_peers=True,
         tub_maker=tub_creator,
@@ -789,16 +797,18 @@ class _Client(node.Node, pollmixin.PollMixin):
             sharetypes.append("mutable")
         expiration_sharetypes = tuple(sharetypes)
 
-        ss = StorageServer(storedir, self.nodeid,
-                           reserved_space=reserved,
-                           discard_storage=discard,
-                           readonly_storage=readonly,
-                           stats_provider=self.stats_provider,
-                           expiration_enabled=expire,
-                           expiration_mode=mode,
-                           expiration_override_lease_duration=o_l_d,
-                           expiration_cutoff_date=cutoff_date,
-                           expiration_sharetypes=expiration_sharetypes)
+        ss = StorageServer(
+            storedir, self.nodeid,
+            reserved_space=reserved,
+            discard_storage=discard,
+            readonly_storage=readonly,
+            stats_provider=self.stats_provider,
+            expiration_enabled=expire,
+            expiration_mode=mode,
+            expiration_override_lease_duration=o_l_d,
+            expiration_cutoff_date=cutoff_date,
+            expiration_sharetypes=expiration_sharetypes,
+        )
         ss.setServiceParent(self)
         return ss
 
@@ -835,6 +845,16 @@ class _Client(node.Node, pollmixin.PollMixin):
 
         announcement.update(plugins_announcement)
 
+        if self.config.get_config("storage", "grid_management", default=False, boolean=True):
+            grid_manager_certificates = self.config.get_grid_manager_certificates()
+            announcement[u"grid-manager-certificates"] = grid_manager_certificates
+
+        # XXX we should probably verify that the certificates are
+        # valid and not expired, as that could be confusing for the
+        # storage-server operator -- but then we need the public key
+        # of the Grid Manager (should that go in the config too,
+        # then? How to handle multiple grid-managers?)
+
         for ic in self.introducer_clients:
             ic.publish("storage", announcement, self._node_private_key)