Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
d7c36d01
Commit
d7c36d01
authored
Nov 07, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[KVM SR] Propagate custom frontend informations to resilience root instance.
parent
6ef83bac
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm-resilient.cfg.jinja2
software/kvm/instance-kvm-resilient.cfg.jinja2
+3
-0
No files found.
software/kvm/common.cfg
View file @
d7c36d01
...
@@ -96,7 +96,7 @@ on-update = true
...
@@ -96,7 +96,7 @@ on-update = true
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
mode = 644
mode = 644
md5sum =
a07c96b53fe9145278cd64a3b27a459
a
md5sum =
e5b514a33ffd3c7cc57d8912189f1fc
a
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @
d7c36d01
...
@@ -31,11 +31,14 @@ return =
...
@@ -31,11 +31,14 @@ return =
# KVM related parameters
# KVM related parameters
# XXX: return ALL parameters (like nat rules), through jinja
# XXX: return ALL parameters (like nat rules), through jinja
backend-url url
backend-url url
# Hardcode this value in case it is not defined
connection-custom-frontend-url =
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
backend-url = ${request-kvm:connection-backend-url}
backend-url = ${request-kvm:connection-backend-url}
url = ${request-kvm:connection-url}
url = ${request-kvm:connection-url}
custom-frontend-url = ${request-kvm:connection-custom-frontend-url}
[kvm-frontend-url-promise]
[kvm-frontend-url-promise]
# Check that url parameter is complete
# Check that url parameter is complete
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment