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
Labels
Merge Requests
91
Merge Requests
91
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
f04ce978
Commit
f04ce978
authored
Dec 11, 2018
by
Guillaume Hervier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/kvm: Fix log path in kvm-started-promise
parent
b2a85732
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+2
-1
software/kvm/software.cfg
software/kvm/software.cfg
+2
-2
software/kvm/template/qemu-is-ready.in
software/kvm/template/qemu-is-ready.in
+3
-1
No files found.
software/kvm/instance-kvm.cfg.jinja2
View file @
f04ce978
...
...
@@ -258,7 +258,8 @@ mode = 700
context =
raw dash {{ dash_executable_location }}
raw qemu_ready_path ${kvm-controller-parameter-dict:kvm-status-path}
raw qemu_service_log_file ${buildout:directory}/.${slap-connection:partition-id}_kvm.log
raw qemu_log_prefix ${buildout:directory}/.${slap-connection:partition-id}_
raw qemu_service_path ${kvm-instance:wrapper-path}
[novnc-instance]
recipe = slapos.cookbook:novnc
...
...
software/kvm/software.cfg
View file @
f04ce978
...
...
@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
md5sum =
0668791e78430bafdec5300b4ea8d90a
md5sum =
6cf71be623ee4c05b03b171b08e252db
download-only = true
on-update = true
...
...
@@ -226,7 +226,7 @@ ignore-existing = true
url = ${:_profile_base_location_}/template/qemu-is-ready.in
mode = 644
filename = qemu-is-ready.in
md5sum =
b304eec8e2cb71f10ea83cac22f6db12
md5sum =
7be600fa7568a79c21e3f596ec70d43b
download-only = true
on-update = true
...
...
software/kvm/template/qemu-is-ready.in
View file @
f04ce978
#!{{ dash }}
FILE="{{ qemu_ready_path }}"
QEMU_SERVICE_PATH="{{ qemu_service_path }}"
# don't start checks too fast
sleep 2
if [ -f "$FILE" ]; then
...
...
@@ -12,7 +14,7 @@ if [ -f "$FILE" ]; then
exit 1
fi
else
log_file="{{ qemu_
service_log_file }}
"
log_file="{{ qemu_
log_prefix }}"$(basename $QEMU_SERVICE_PATH-*)".log
"
>&2 echo "Qemu process is not correctly started."
if [ -f "$log_file" ]; then
>&2 echo "** Latest ouput logs **"
...
...
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