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
Romain Courteaud
slapos
Commits
2a703825
Commit
2a703825
authored
Jul 01, 2011
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes to kvm templates
parent
50d0d648
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
slapos/recipe/kvm/template/kvm_controller_run.in
slapos/recipe/kvm/template/kvm_controller_run.in
+1
-1
slapos/recipe/kvm/template/kvm_run.in
slapos/recipe/kvm/template/kvm_run.in
+3
-3
slapos/recipe/kvm/template/slapmonitor_run.in
slapos/recipe/kvm/template/slapmonitor_run.in
+1
-1
slapos/recipe/kvm/template/websockify_run.in
slapos/recipe/kvm/template/websockify_run.in
+5
-0
No files found.
slapos/recipe/kvm/template/kvm_controller_run.in
View file @
2a703825
...
@@ -11,7 +11,7 @@ so = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
...
@@ -11,7 +11,7 @@ so = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
connected = False
connected = False
while not connected:
while not connected:
try:
try:
so.connect('%(
qmp_socket
)s')
so.connect('%(
socket_path
)s')
except socket.error:
except socket.error:
time.sleep(1)
time.sleep(1)
else:
else:
...
...
slapos/recipe/kvm/template/kvm_run.in
View file @
2a703825
...
@@ -10,8 +10,8 @@ exec %(qemu_path)s \
...
@@ -10,8 +10,8 @@ exec %(qemu_path)s \
-smp
%
(
smp_count
)
s
\
-smp
%
(
smp_count
)
s
\
-m
%
(
ram_size
)
s
\
-m
%
(
ram_size
)
s
\
-cdrom
nbd:[%
(
nbd_ip
)
s]:%
(
nbd_port
)
s
\
-cdrom
nbd:[%
(
nbd_ip
)
s]:%
(
nbd_port
)
s
\
-drive
file
=
%
(
image
)
s,if
=
virtio,boot
=
on
\
-drive
file
=
%
(
disk_path
)
s,if
=
virtio,boot
=
on
\
-vnc
[
%
(
vnc_ip
)
s]:1,ipv6,tls,password
\
-vnc
[
%
(
vnc_ip
)
s]:1,ipv6,tls,password
\
-boot
menu
=
on
\
-boot
menu
=
on
\
-qmp
unix:%
(
qmp_socket
)
s,server
\
-qmp
unix:%
(
socket_path
)
s,server
\
-pidfile
%
(
pid_file
)
s
-pidfile
%
(
pid_file
_path
)
s
slapos/recipe/kvm/template/slapmonitor_run.in
View file @
2a703825
#!/bin/sh
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
# BEWARE: It will be overwritten automatically
exec
%
(
python_path
)
s %
(
slapmonitor_path
)
s %
(
pid_file
)
s %
(
database_path
)
s
exec
%
(
python_path
)
s %
(
slapmonitor_path
)
s %
(
pid_file
_path
)
s %
(
database_path
)
s
slapos/recipe/kvm/template/websockify_run.in
0 → 100644
View file @
2a703825
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
%
(
python_path
)
s %
(
websockify_path
)
s
--web
%
(
noVNC_location
)
s
--ssl-only
%
(
proxy_ip
)
s:%
(
proxy_port
)
s %
(
vnc_ip
)
s:%
(
vnc_port
)
s
\ No newline at end of file
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