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
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
Roque
slapos
Commits
8bc96bdb
Commit
8bc96bdb
authored
Nov 19, 2014
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: test software-release waits for kvm-resilient instance to be ready
i.e returns parameters.
parent
e05aaa1a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm-resilient-test.cfg.jinja2
software/kvm/instance-kvm-resilient-test.cfg.jinja2
+1
-0
software/kvm/instance-kvm-resilient.cfg.jinja2
software/kvm/instance-kvm-resilient.cfg.jinja2
+1
-1
No files found.
software/kvm/common.cfg
View file @
8bc96bdb
...
@@ -101,7 +101,7 @@ on-update = true
...
@@ -101,7 +101,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 =
8134b3176bcde9a5a27804cf9bbbd5cf
md5sum =
7071b61a862ee681c2e4323e6435e98d
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm-resilient-test.cfg.jinja2
View file @
8bc96bdb
...
@@ -60,6 +60,7 @@ config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
...
@@ -60,6 +60,7 @@ config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-resiliency-backup-periodicity = */5 * * * *
config-resiliency-backup-periodicity = */5 * * * *
config-resilient-clone-number = 1
config-resilient-clone-number = 1
return = ipv6
# XXX What to do?
# XXX What to do?
sla-computer_guid = ${slap-connection:computer-id}
sla-computer_guid = ${slap-connection:computer-id}
...
...
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @
8bc96bdb
...
@@ -38,7 +38,7 @@ return =
...
@@ -38,7 +38,7 @@ return =
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}
ipv6 =
{request-kvm:
ip}
ipv6 =
${request-kvm:connection-
ip}
[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