diff --git a/slapos/grid/SlapObject.py b/slapos/grid/SlapObject.py index 10292fbe41df52cd61b01a95871d58c1f0038426..c7f42456ef8f2d6259acc558adc5e398d1e1f8d8 100644 --- a/slapos/grid/SlapObject.py +++ b/slapos/grid/SlapObject.py @@ -344,7 +344,8 @@ class Partition(object): certificate_repository_path=None, retention_delay='0', instance_min_free_space=None, - instance_storage_home='' + instance_storage_home='', + ipv4_global_network='', ): """Initialisation of class parameters""" self.buildout = buildout @@ -362,6 +363,7 @@ class Partition(object): self.server_url = server_url self.software_release_url = software_release_url self.instance_storage_home = instance_storage_home + self.ipv4_global_network = ipv4_global_network self.key_file = '' self.cert_file = '' @@ -517,6 +519,7 @@ class Partition(object): 'key_file': self.key_file, 'cert_file': self.cert_file, 'storage_home': self.instance_storage_home, + 'global_ipv4_network_prefix': self.ipv4_global_network, } open(config_location, 'w').write(buildout_text) os.chmod(config_location, 0o640) diff --git a/slapos/grid/slapgrid.py b/slapos/grid/slapgrid.py index 6628614119d58ad69730b6d3aba9328a4eaa1bab..86de66f1d0aab7c74aabf46432f710e5a5b44f95 100644 --- a/slapos/grid/slapgrid.py +++ b/slapos/grid/slapgrid.py @@ -234,7 +234,8 @@ def create_slapgrid_object(options, logger): computer_partition_filter_list=op.get('only-cp', op.get('only_cp')), software_min_free_space=software_min_free_space, instance_min_free_space=instance_min_free_space, - instance_storage_home=op.get('instance_storage_home')) + instance_storage_home=op.get('instance_storage_home'), + ipv4_global_network=op.get('ipv4_global_network')) def check_required_only_partitions(existing, required): @@ -289,6 +290,7 @@ class Slapgrid(object): software_min_free_space=None, instance_min_free_space=None, instance_storage_home=None, + ipv4_global_network=None, ): """Makes easy initialisation of class parameters""" # Parses arguments @@ -344,6 +346,10 @@ class Slapgrid(object): self.instance_storage_home = os.path.abspath(instance_storage_home) else: self.instance_storage_home = "" + if ipv4_global_network: + self.ipv4_global_network = ipv4_global_network + else: + self.ipv4_global_network= "" def _getWatchdogLine(self): invocation_list = [WATCHDOG_PATH] @@ -783,6 +789,7 @@ class Slapgrid(object): retention_delay=retention_delay, instance_min_free_space=self.instance_min_free_space, instance_storage_home=self.instance_storage_home, + ipv4_global_network=self.ipv4_global_network, ) computer_partition_state = computer_partition.getState() @@ -1252,6 +1259,7 @@ class Slapgrid(object): buildout=self.buildout, logger=self.logger, instance_storage_home=self.instance_storage_home, + ipv4_global_network=self.ipv4_global_network, ) local_partition.stop() try: diff --git a/slapos/grid/templates/buildout-tail.cfg.in b/slapos/grid/templates/buildout-tail.cfg.in index 3f117df4319e6b3477e694d6b66c66ea0250d444..50f2be6a4854367a3ba65f41c638d1a1b48fe589 100644 --- a/slapos/grid/templates/buildout-tail.cfg.in +++ b/slapos/grid/templates/buildout-tail.cfg.in @@ -25,4 +25,7 @@ cert_file = %(cert_file)s [storage-configuration] storage-home = %(storage_home)s + +[network-information] +global-ipv4-network = %(global_ipv4_network_prefix)s # This is end of zc.builodout profile's tail added by slapgrid