Commit fc731adb authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

software/theia: give a full range to SlapOS standalone

parent 6f281c26
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
[instance-theia] [instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in _update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = 00d15432c1486376d8ba7d0f5ec63c33 md5sum = 864a40d9afdd2523e66c9cab40dc1f24
[instance] [instance]
_update_hash_filename_ = instance.cfg.in _update_hash_filename_ = instance.cfg.in
md5sum = f2f01a47d98a980177dc1755e618bbb7 md5sum = adff948b9d926f3ebcbb7cdb380665c9
[instance-import] [instance-import]
_update_hash_filename_ = instance-import.cfg.jinja.in _update_hash_filename_ = instance-import.cfg.jinja.in
......
...@@ -491,7 +491,7 @@ ip = {{ ipv4_random }} ...@@ -491,7 +491,7 @@ ip = {{ ipv4_random }}
[slapos-standalone-config] [slapos-standalone-config]
ipv4 = {{ ipv4_random }} ipv4 = {{ ipv4_random }}
ipv6 = {{ ipv6_random }} ipv6-range = {{ ipv6_range }}
port = $${slapos-standalone-port:port} port = $${slapos-standalone-port:port}
local-software-release-root = $${directory:home} local-software-release-root = $${directory:home}
slapos-configuration = $${directory:runner}/etc/slapos.cfg slapos-configuration = $${directory:runner}/etc/slapos.cfg
...@@ -564,7 +564,7 @@ template = ...@@ -564,7 +564,7 @@ template =
try: try:
partition_count = 20 partition_count = 20
print("Standalone SlapOS: Formatting %d partitions" % partition_count) print("Standalone SlapOS: Formatting %d partitions" % partition_count)
standalone.format(partition_count, '$${slapos-standalone-config:ipv4}', '$${slapos-standalone-config:ipv6}') standalone.format(partition_count, '$${slapos-standalone-config:ipv4}', '$${slapos-standalone-config:ipv6-range}')
print("Standalone SlapOS for computer `$${slapos-standalone-config:computer-id}` started") print("Standalone SlapOS for computer `$${slapos-standalone-config:computer-id}` started")
# Run instance at least once, to start the supervisor managing instances. # Run instance at least once, to start the supervisor managing instances.
try: try:
......
...@@ -37,7 +37,8 @@ context = ...@@ -37,7 +37,8 @@ context =
key parameter_dict slap-configuration:configuration key parameter_dict slap-configuration:configuration
key root_title slap-configuration:root-instance-title key root_title slap-configuration:root-instance-title
key partition_root_path buildout:directory key partition_root_path buildout:directory
key ipv6_random slap-configuration:ipv6-random key ipv6_range slap-configuration:ipv6-range-network
key ipv6_theia slap-configuration:ipv6-random
key ipv4_random slap-configuration:ipv4-random key ipv4_random slap-configuration:ipv4-random
import os_module os import os_module os
import hashlib_module hashlib import hashlib_module hashlib
......
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