Commit c9504e97 authored by Xavier Thompson's avatar Xavier Thompson

Publish ipv6 in Theia connection parameters and in shell

See merge request nexedi/slapos!1128
parents b289489c e415a724
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-theia] [instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in _update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = 4df9f0d76a134a8abec9060a0c1be50b md5sum = 00d15432c1486376d8ba7d0f5ec63c33
[instance] [instance]
_update_hash_filename_ = instance.cfg.in _update_hash_filename_ = instance.cfg.in
...@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c ...@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
[instance-resilient] [instance-resilient]
_update_hash_filename_ = instance-resilient.cfg.jinja _update_hash_filename_ = instance-resilient.cfg.jinja
md5sum = b1e338973bc9cfe1bb4e16d46b3c6da9 md5sum = ad9499e7355ded4975ad313442cecb7a
[theia-common] [theia-common]
_update_hash_filename_ = theia_common.py _update_hash_filename_ = theia_common.py
......
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
"backend-url": { "backend-url": {
"description": "Theia Backend URL", "description": "Theia Backend URL",
"type": "string" "type": "string"
},
"ipv6": {
"description": "A Theia ipv6 address",
"type": "string"
} }
}, },
"type": "object" "type": "object"
......
...@@ -33,7 +33,7 @@ parts += ...@@ -33,7 +33,7 @@ parts +=
# Ask for the connection parameters of the main theia # Ask for the connection parameters of the main theia
[request-theia] [request-theia]
return += url username password backend-url return += url username password backend-url ipv6
# Publish connection parameters of the main theia and resiliency parameters # Publish connection parameters of the main theia and resiliency parameters
...@@ -43,6 +43,7 @@ url = ${request-theia:connection-url} ...@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
username = ${request-theia:connection-username} username = ${request-theia:connection-username}
password = ${request-theia:connection-password} password = ${request-theia:connection-password}
backend-url = ${request-theia:connection-backend-url} backend-url = ${request-theia:connection-backend-url}
ipv6 = ${request-theia:connection-ipv6}
monitor-base-url = ${monitor-publish:monitor-base-url} monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url} monitor-setup-url = ${monitor-publish:monitor-setup-url}
<= publish-connection-information <= publish-connection-information
...@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access} ...@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
username = $${frontend-instance-password:username} username = $${frontend-instance-password:username}
password = $${frontend-instance-password:passwd} password = $${frontend-instance-password:passwd}
backend-url = $${frontend-instance:url} backend-url = $${frontend-instance:url}
ipv6 = {{ ipv6_random }}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -353,7 +353,7 @@ template = ...@@ -353,7 +353,7 @@ template =
#!/bin/sh #!/bin/sh
export HOME=$${directory:home} export HOME=$${directory:home}
export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
export IPV6_SLAPRUNNER={{ ipv6_random }}
# Theia Backend # Theia Backend
# ------------- # -------------
......
...@@ -125,6 +125,9 @@ class TestTheia(TheiaTestCase): ...@@ -125,6 +125,9 @@ class TestTheia(TheiaTestCase):
resp = self.get(urljoin(authenticated_url, url)) resp = self.get(urljoin(authenticated_url, url))
self.assertTrue(resp.raw) self.assertTrue(resp.raw)
def test_ipv6_parameter_published(self):
self.assertIn('ipv6', self.connection_parameters)
def test_theia_slapos(self): def test_theia_slapos(self):
# Make sure we can use the shell and the integrated slapos command # Make sure we can use the shell and the integrated slapos command
process = pexpect.spawnu( process = pexpect.spawnu(
......
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