From 2a7038253372eca3062d948d2b05852b85ca6db9 Mon Sep 17 00:00:00 2001
From: Vivien Alger <algervivie@tiolive.com>
Date: Fri, 1 Jul 2011 13:40:56 +0200
Subject: [PATCH] Changes to kvm templates
---
slapos/recipe/kvm/template/kvm_controller_run.in | 2 +-
slapos/recipe/kvm/template/kvm_run.in | 6 +++---
slapos/recipe/kvm/template/slapmonitor_run.in | 2 +-
slapos/recipe/kvm/template/websockify_run.in | 5 +++++
4 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 slapos/recipe/kvm/template/websockify_run.in
diff --git a/slapos/recipe/kvm/template/kvm_controller_run.in b/slapos/recipe/kvm/template/kvm_controller_run.in
index 09b63735c..a2c3ce66d 100644
--- a/slapos/recipe/kvm/template/kvm_controller_run.in
+++ b/slapos/recipe/kvm/template/kvm_controller_run.in
@@ -11,7 +11,7 @@ so = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
connected = False
while not connected:
try:
- so.connect('%(qmp_socket)s')
+ so.connect('%(socket_path)s')
except socket.error:
time.sleep(1)
else:
diff --git a/slapos/recipe/kvm/template/kvm_run.in b/slapos/recipe/kvm/template/kvm_run.in
index f475693f2..51d9a3301 100644
--- a/slapos/recipe/kvm/template/kvm_run.in
+++ b/slapos/recipe/kvm/template/kvm_run.in
@@ -10,8 +10,8 @@ exec %(qemu_path)s \
-smp %(smp_count)s \
-m %(ram_size)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 \
-boot menu=on \
- -qmp unix:%(qmp_socket)s,server \
- -pidfile %(pid_file)s
+ -qmp unix:%(socket_path)s,server \
+ -pidfile %(pid_file_path)s
diff --git a/slapos/recipe/kvm/template/slapmonitor_run.in b/slapos/recipe/kvm/template/slapmonitor_run.in
index 13f18940b..c790e0904 100644
--- a/slapos/recipe/kvm/template/slapmonitor_run.in
+++ b/slapos/recipe/kvm/template/slapmonitor_run.in
@@ -1,4 +1,4 @@
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# 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
diff --git a/slapos/recipe/kvm/template/websockify_run.in b/slapos/recipe/kvm/template/websockify_run.in
new file mode 100644
index 000000000..24f2efbce
--- /dev/null
+++ b/slapos/recipe/kvm/template/websockify_run.in
@@ -0,0 +1,5 @@
+#!/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
--
2.30.9