Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
slapos
Commits
e09faed2
Commit
e09faed2
authored
Oct 04, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
KVM SR: resilient root instance: add promise to check for url parameter validity.
parent
8b3b8ac3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-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
+12
-0
No files found.
software/kvm/common.cfg
View file @
e09faed2
...
@@ -95,7 +95,7 @@ mode = 0644
...
@@ -95,7 +95,7 @@ mode = 0644
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 = 6753004b582c0470bd028253ce1964ad
md5sum = 0f53856c6f981b34bbe03f6604ccdecb
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @
e09faed2
...
@@ -12,6 +12,7 @@ offline = true
...
@@ -12,6 +12,7 @@ offline = true
parts +=
parts +=
{{ parts.replicate("kvm", "3") }}
{{ parts.replicate("kvm", "3") }}
publish-connection-informations
publish-connection-informations
kvm-frontend-url-promise
{{ replicated.replicate("kvm", "3", "kvm-export", "kvm-import", slapparameter_dict=slapparameter_dict) }}
{{ replicated.replicate("kvm", "3", "kvm-export", "kvm-import", slapparameter_dict=slapparameter_dict) }}
...
@@ -29,3 +30,14 @@ recipe = slapos.cookbook:publish
...
@@ -29,3 +30,14 @@ 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}
ipv6 = ${request-kvm:connection-ipv6}
ipv6 = ${request-kvm:connection-ipv6}
[kvm-frontend-url-promise]
# Check that url parameter is complete
recipe = collective.recipe.template
input = inline:#!/bin/sh
URL="${request-kvm:connection-url}"
if [[ ! "$URL" == https://* ]]; then
exit 1
fi
output = ${resilient-directory:promise}/kvm-frontend-url
mode = 700
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