diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index 014c1c9de5e243b943d44c337f65d82bfd4c6067..5fddf5b394d019d80fe9b7adef4c65e8a5e01353 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -93,7 +93,7 @@ mode = 0644 recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja mode = 644 -md5sum = 3ee64c654aae503b93b39e9ccd6d3643 +md5sum = aa4b5a8f6da151ae02cc1350ba40c23e [template-kvm-import] recipe = slapos.recipe.template diff --git a/software/kvm/instance-kvm-resilient.cfg.jinja2 b/software/kvm/instance-kvm-resilient.cfg.jinja2 index 44f56df66c614ef8cc0fdbfc0cac38abe7a66fc3..8943e1fa3c1abf9bf5033ff79804caf11c7126c3 100644 --- a/software/kvm/instance-kvm-resilient.cfg.jinja2 +++ b/software/kvm/instance-kvm-resilient.cfg.jinja2 @@ -28,4 +28,4 @@ return = recipe = slapos.cookbook:publish backend-url = ${request-kvm:connection-backend-url} url = ${request-kvm:connection-url} - +ipv6 = ${request-kvm:connection-ipv6} diff --git a/software/kvm/instance-kvm.cfg.in b/software/kvm/instance-kvm.cfg.in index 4f44afc3ecb847444ce2cd45e02ab7a0aad0df43..48581fa8958c34963f3f56f058ff55c7bf5aa516 100644 --- a/software/kvm/instance-kvm.cfg.in +++ b/software/kvm/instance-kvm.cfg.in @@ -214,7 +214,7 @@ sla-instance_guid = $${slap-parameter:frontend-instance-guid} recipe = slapos.cookbook:publish backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1&password=$${kvm-instance:vnc-passwd} url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}&password=$${kvm-instance:vnc-passwd} - +ipv6 = $${slap-network-information:global-ipv6} [frontend-promise] recipe = slapos.cookbook:check_url_available