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
72a524af
Commit
72a524af
authored
Oct 17, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update connection parameters to convention: xx-xx.
parent
3be7b11d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
software/kvm/instance-kvm.cfg.in
software/kvm/instance-kvm.cfg.in
+3
-3
software/kvm/software.cfg
software/kvm/software.cfg
+1
-1
No files found.
software/kvm/instance-kvm.cfg.in
View file @
72a524af
...
@@ -145,7 +145,7 @@ sla-instance_guid = $${slap-parameter:frontend-instance-guid}
...
@@ -145,7 +145,7 @@ sla-instance_guid = $${slap-parameter:frontend-instance-guid}
[publish-kvm-backend-connection-information]
[publish-kvm-backend-connection-information]
recipe = slapos.cookbook:publish
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
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:passwd}
password = $${kvm-instance:passwd}
[publish-kvm-frontend-connection-information]
[publish-kvm-frontend-connection-information]
...
@@ -169,8 +169,8 @@ nbd-port = 1024
...
@@ -169,8 +169,8 @@ nbd-port = 1024
nbd-ip = debian.nbd.vifib.net
nbd-ip = debian.nbd.vifib.net
# backward compatibility: old style (nbd_port) can still be used.
# backward compatibility: old style (nbd_port) can still be used.
nbd_port = ${:nbd-port}
nbd_port = $
$
{:nbd-port}
nbd_ip = ${:nbd-ip}
nbd_ip = $
$
{:nbd-ip}
ram-size = 1024
ram-size = 1024
disk-size = 10
disk-size = 10
software/kvm/software.cfg
View file @
72a524af
...
@@ -119,7 +119,7 @@ command =
...
@@ -119,7 +119,7 @@ command =
[template-kvm]
[template-kvm]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-kvm.cfg.in
url = ${:_profile_base_location_}/instance-kvm.cfg.in
md5sum =
eecb8d7b5bb4d21fd9e9596424ccb421
md5sum =
67c1980ba1e70b376f2811602991ff09
output = ${buildout:directory}/template-kvm.cfg
output = ${buildout:directory}/template-kvm.cfg
mode = 0644
mode = 0644
...
...
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