Commit 9f79a6dd authored by Titouan Soulard's avatar Titouan Soulard

slapgrid: propagate slapgrid_jio_uri

parent 764f1754
...@@ -438,6 +438,7 @@ class Partition(object): ...@@ -438,6 +438,7 @@ class Partition(object):
buildout_debug=False, buildout_debug=False,
partition_timeout=None, partition_timeout=None,
api_backward_compatibility=False, api_backward_compatibility=False,
slapgrid_jio_uri=None
): ):
"""Initialisation of class parameters""" """Initialisation of class parameters"""
self.buildout = buildout self.buildout = buildout
...@@ -461,6 +462,7 @@ class Partition(object): ...@@ -461,6 +462,7 @@ class Partition(object):
self.ipv4_global_network = ipv4_global_network self.ipv4_global_network = ipv4_global_network
self.partition_timeout = partition_timeout self.partition_timeout = partition_timeout
self.api_backward_compatibility = api_backward_compatibility self.api_backward_compatibility = api_backward_compatibility
self.slapgrid_jio_uri = slapgrid_jio_uri
self.key_file = '' self.key_file = ''
self.cert_file = '' self.cert_file = ''
...@@ -633,6 +635,7 @@ class Partition(object): ...@@ -633,6 +635,7 @@ class Partition(object):
'software_instance_reference': self.computer_partition.get("reference"), 'software_instance_reference': self.computer_partition.get("reference"),
'server_url': self.server_url, 'server_url': self.server_url,
'software_release_url': self.software_release_url, 'software_release_url': self.software_release_url,
'slapgrid_jio_uri': self.slapgrid_jio_uri,
'key_file': self.key_file, 'key_file': self.key_file,
'cert_file': self.cert_file, 'cert_file': self.cert_file,
'storage_home': self.instance_storage_home, 'storage_home': self.instance_storage_home,
......
...@@ -319,8 +319,8 @@ def create_slapgrid_object(options, logger): ...@@ -319,8 +319,8 @@ def create_slapgrid_object(options, logger):
firewall_conf=op.get('firewall'), firewall_conf=op.get('firewall'),
config=options, config=options,
force_stop=op.get('force_stop', False), 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): def check_required_only_partitions(existing, required):
""" """
...@@ -1251,6 +1251,7 @@ stderr_logfile_backups=1 ...@@ -1251,6 +1251,7 @@ stderr_logfile_backups=1
computer_id=self.computer_id, computer_id=self.computer_id,
partition_id=computer_partition_id, partition_id=computer_partition_id,
server_url=self.master_url, server_url=self.master_url,
slapgrid_jio_uri=self.slapgrid_jio_uri,
software_release_url=software_url, software_release_url=software_url,
certificate_repository_path=self.certificate_repository_path, certificate_repository_path=self.certificate_repository_path,
buildout=self.buildout, buildout=self.buildout,
...@@ -1338,6 +1339,7 @@ stderr_logfile_backups=1 ...@@ -1338,6 +1339,7 @@ stderr_logfile_backups=1
computer_id=self.computer_id, computer_id=self.computer_id,
partition_id=computer_partition_id, partition_id=computer_partition_id,
server_url=self.master_url, server_url=self.master_url,
slapgrid_jio_uri=self.slapgrid_jio_uri,
software_release_url=software_url, software_release_url=software_url,
certificate_repository_path=self.certificate_repository_path, certificate_repository_path=self.certificate_repository_path,
buildout=self.buildout, buildout=self.buildout,
...@@ -2047,6 +2049,7 @@ stderr_logfile_backups=1 ...@@ -2047,6 +2049,7 @@ stderr_logfile_backups=1
computer_id=self.computer_id, computer_id=self.computer_id,
partition_id=computer_partition_id, partition_id=computer_partition_id,
server_url=self.master_url, server_url=self.master_url,
slapgrid_jio_uri=self.slapgrid_jio_uri,
software_release_url=software_url, software_release_url=software_url,
certificate_repository_path=self.certificate_repository_path, certificate_repository_path=self.certificate_repository_path,
buildout=self.buildout, buildout=self.buildout,
......
...@@ -10,6 +10,7 @@ offline = true ...@@ -10,6 +10,7 @@ offline = true
computer-id = %(computer_id)s computer-id = %(computer_id)s
partition-id = %(partition_id)s partition-id = %(partition_id)s
server-url = %(server_url)s server-url = %(server_url)s
slapgrid-jio-uri = %(slapgrid_jio_uri)s
software-release-url = %(software_release_url)s software-release-url = %(software_release_url)s
key-file = %(key_file)s key-file = %(key_file)s
cert-file = %(cert_file)s cert-file = %(cert_file)s
...@@ -39,4 +40,4 @@ software-type = %(instance_software_type)s ...@@ -39,4 +40,4 @@ software-type = %(instance_software_type)s
reference = %(software_instance_reference)s reference = %(software_instance_reference)s
processing-timestamp = %(instance_processing_timestamp)s processing-timestamp = %(instance_processing_timestamp)s
connection-parameters-md5sum = %(connection_parameters_md5sum)s connection-parameters-md5sum = %(connection_parameters_md5sum)s
parameters-md5sum = %(parameters_md5sum)s parameters-md5sum = %(parameters_md5sum)s
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment