slapgrid: propagate slapgrid_jio_uri

slapos/grid/SlapObject.py

@@ -438,6 +438,7 @@ class Partition(object):
                buildout_debug=False,
                partition_timeout=None,
                api_backward_compatibility=False,
+               slapgrid_jio_uri=None
                ):
     """Initialisation of class parameters"""
     self.buildout = buildout
@@ -461,6 +462,7 @@ class Partition(object):
     self.ipv4_global_network = ipv4_global_network
     self.partition_timeout = partition_timeout
     self.api_backward_compatibility = api_backward_compatibility
+    self.slapgrid_jio_uri = slapgrid_jio_uri
 
     self.key_file = ''
     self.cert_file = ''
@@ -633,6 +635,7 @@ class Partition(object):
             'software_instance_reference': self.computer_partition.get("reference"),
             'server_url': self.server_url,
             'software_release_url': self.software_release_url,
+            'slapgrid_jio_uri': self.slapgrid_jio_uri,
             'key_file': self.key_file,
             'cert_file': self.cert_file,
             'storage_home': self.instance_storage_home,

slapos/grid/slapgrid.py

@@ -319,8 +319,8 @@ def create_slapgrid_object(options, logger):
                   firewall_conf=op.get('firewall'),
                   config=options,
                   force_stop=op.get('force_stop', False),
-                  partition_timeout=partition_timeout)
-
+                  partition_timeout=partition_timeout,
+                  slapgrid_jio_uri=op.get('slapgrid_jio_uri', None))
 
 def check_required_only_partitions(existing, required):
   """
@@ -1251,6 +1251,7 @@ stderr_logfile_backups=1
       computer_id=self.computer_id,
       partition_id=computer_partition_id,
       server_url=self.master_url,
+      slapgrid_jio_uri=self.slapgrid_jio_uri,
       software_release_url=software_url,
       certificate_repository_path=self.certificate_repository_path,
       buildout=self.buildout,
@@ -1338,6 +1339,7 @@ stderr_logfile_backups=1
       computer_id=self.computer_id,
       partition_id=computer_partition_id,
       server_url=self.master_url,
+      slapgrid_jio_uri=self.slapgrid_jio_uri,
       software_release_url=software_url,
       certificate_repository_path=self.certificate_repository_path,
       buildout=self.buildout,
@@ -2047,6 +2049,7 @@ stderr_logfile_backups=1
             computer_id=self.computer_id,
             partition_id=computer_partition_id,
             server_url=self.master_url,
+            slapgrid_jio_uri=self.slapgrid_jio_uri,
             software_release_url=software_url,
             certificate_repository_path=self.certificate_repository_path,
             buildout=self.buildout,

slapos/grid/templates/buildout-tail.cfg.in

@@ -10,6 +10,7 @@ offline = true
 computer-id = %(computer_id)s
 partition-id = %(partition_id)s
 server-url = %(server_url)s
+slapgrid-jio-uri = %(slapgrid_jio_uri)s
 software-release-url = %(software_release_url)s
 key-file = %(key_file)s
 cert-file = %(cert_file)s
@@ -39,4 +40,4 @@ software-type = %(instance_software_type)s
 reference = %(software_instance_reference)s
 processing-timestamp = %(instance_processing_timestamp)s
 connection-parameters-md5sum = %(connection_parameters_md5sum)s
-parameters-md5sum = %(parameters_md5sum)s
\ No newline at end of file
+parameters-md5sum = %(parameters_md5sum)s