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
54352efc
Commit
54352efc
authored
Apr 13, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: use same section name as slaprunner, for the tests.
parent
321235d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
software/kvm/common.cfg
software/kvm/common.cfg
+2
-5
software/kvm/instance.cfg.in
software/kvm/instance.cfg.in
+2
-2
No files found.
software/kvm/common.cfg
View file @
54352efc
...
@@ -15,9 +15,6 @@ extends =
...
@@ -15,9 +15,6 @@ extends =
# stacks are listed from most generic to most specific,
# stacks are listed from most generic to most specific,
# to avoid versioning issues
# to avoid versioning issues
common-parts =
common-parts =
template
template
eggs
eggs
...
@@ -92,7 +89,7 @@ command =
...
@@ -92,7 +89,7 @@ command =
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
md5sum = 7
33ee7530831229aeee0aeb3460ab2ee
md5sum = 7
21d3d665d6340e1e0cd1eb3e8cac6bc
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
...
@@ -155,7 +152,7 @@ recipe = hexagonit.recipe.download
...
@@ -155,7 +152,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
mode = 644
mode = 644
md5sum = c2ab8a5ff9d8cd351682382ea06b3328
md5sum = c2ab8a5ff9d8cd351682382ea06b3328
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance.cfg.in
View file @
54352efc
[buildout]
[buildout]
parts =
parts =
switch
-
softwaretype
switch
_
softwaretype
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
extends = ${template-resilient-templates:output}
extends = ${template-resilient-templates:output}
[switch
-
softwaretype]
[switch
_
softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = $${:kvm}
default = $${:kvm}
kvm-cluster = $${dynamic-template-kvm-cluster:rendered}
kvm-cluster = $${dynamic-template-kvm-cluster: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