From d7c36d01f1c548771441e208911c46decf8c9a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Thu, 7 Nov 2013 12:25:22 +0000 Subject: [PATCH] [KVM SR] Propagate custom frontend informations to resilience root instance. --- software/kvm/common.cfg | 2 +- software/kvm/instance-kvm-resilient.cfg.jinja2 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index e4444c03a..e24ff5abe 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -96,7 +96,7 @@ on-update = true recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2 mode = 644 -md5sum = a07c96b53fe9145278cd64a3b27a459a +md5sum = e5b514a33ffd3c7cc57d8912189f1fca download-only = true on-update = true diff --git a/software/kvm/instance-kvm-resilient.cfg.jinja2 b/software/kvm/instance-kvm-resilient.cfg.jinja2 index ff920015a..e1c770517 100644 --- a/software/kvm/instance-kvm-resilient.cfg.jinja2 +++ b/software/kvm/instance-kvm-resilient.cfg.jinja2 @@ -31,11 +31,14 @@ return = # KVM related parameters # XXX: return ALL parameters (like nat rules), through jinja backend-url url +# Hardcode this value in case it is not defined + connection-custom-frontend-url = [publish-connection-informations] recipe = slapos.cookbook:publish backend-url = ${request-kvm:connection-backend-url} url = ${request-kvm:connection-url} +custom-frontend-url = ${request-kvm:connection-custom-frontend-url} [kvm-frontend-url-promise] # Check that url parameter is complete -- 2.30.9