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
Georgios Dagkakis
slapos
Commits
7f3d480d
Commit
7f3d480d
authored
May 10, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[kvm] -> [qemu]
parent
f5478892
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
component/qemu-kvm/buildout.cfg
component/qemu-kvm/buildout.cfg
+0
-6
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/instance.cfg.in
software/kvm/instance.cfg.in
+4
-4
No files found.
component/qemu-kvm/buildout.cfg
View file @
7f3d480d
...
...
@@ -13,14 +13,8 @@ extends =
../pcre/buildout.cfg
../glib/buildout.cfg
# XXX Change all reference to kvm section to qemu section, then
# use qemu as main name section.
[qemu]
<= kvm
[kvm]
recipe = slapos.recipe.cmmi
# qemu-kvm and qemu are now the same since 1.3.
url = https://download.qemu.org/qemu-4.1.1.tar.xz
md5sum = 53879f792ef2675c6c5e6cbf5cc1ac6c
configure-options =
...
...
software/kvm/buildout.hash.cfg
View file @
7f3d480d
...
...
@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
md5sum =
092405e2fba77c22d4dc8cefcab677d
8
md5sum =
1edb1e8d7cab32c29504a23fd304683
8
[template-kvm]
filename = instance-kvm.cfg.jinja2
...
...
software/kvm/instance.cfg.in
View file @
7f3d480d
...
...
@@ -88,8 +88,8 @@ extra-context =
raw netcat_bin ${netcat:location}/bin/netcat
raw python_executable ${buildout:executable}
raw python_eggs_executable ${buildout:bin-directory}/${python-with-eggs:interpreter}
raw qemu_executable_location ${
kvm
:location}/bin/qemu-system-x86_64
raw qemu_img_executable_location ${
kvm
:location}/bin/qemu-img
raw qemu_executable_location ${
qemu
:location}/bin/qemu-system-x86_64
raw qemu_img_executable_location ${
qemu
:location}/bin/qemu-img
raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
raw template_httpd_cfg ${template-httpd:rendered}
...
...
@@ -144,7 +144,7 @@ extensions = jinja2.ext.do
context =
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
raw qemu_location ${kvm:location}
key qemu_location qemu:location
raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
key pbsready_import_template template-pbsready-import:rendered
key slapparameter_dict slap-configuration:configuration
...
...
@@ -161,7 +161,7 @@ context =
key slapparameter_dict slap-configuration:configuration
key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
raw qemu_nbd_executable_location ${
kvm
:location}/bin/qemu-nbd
raw qemu_nbd_executable_location ${
qemu
:location}/bin/qemu-nbd
raw dash_executable_location ${dash:location}/bin/dash
raw onetimeupload_executable_location ${buildout:bin-directory}/onetimeupload
raw template_monitor ${monitor2-template:rendered}
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