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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ophélie Gagnard
slapos
Commits
b5f90b05
Commit
b5f90b05
authored
May 22, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm-cluster: default slave frontend softwar_type to 'custom-personal'
parent
5b72d43b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm-cluster-input-schema.json
software/kvm/instance-kvm-cluster-input-schema.json
+1
-1
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+1
-1
No files found.
software/kvm/common.cfg
View file @
b5f90b05
...
...
@@ -103,7 +103,7 @@ on-update = true
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
mode = 644
md5sum =
3523fd4d1b9038ab8dca95fe5454778d
md5sum =
cc72d7b89d8b474d7b4f2c9319b385d5
download-only = true
on-update = true
...
...
software/kvm/instance-kvm-cluster-input-schema.json
View file @
b5f90b05
...
...
@@ -43,7 +43,7 @@
"title"
:
"Frontend Software Type"
,
"description"
:
"Type of the frontend instance, like
\"
frontend
\"
."
,
"type"
:
"string"
,
"default"
:
"
default
"
"default"
:
"
custom-personal
"
},
"frontend-software-url"
:
{
"title"
:
"Frontend Software URL"
,
...
...
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
b5f90b05
...
...
@@ -4,7 +4,7 @@
{% set frontend_dict = slapparameter_dict.get('frontend', {}) -%}
{% set slave_frontend_dict = slapparameter_dict.get('slave-frontend', {}) -%}
{% set slave_frontend_sr = slave_frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') -%}
{% set slave_frontend_stype = slave_frontend_dict.get('software-type', '
default
') -%}
{% set slave_frontend_stype = slave_frontend_dict.get('software-type', '
custom-personal
') -%}
{% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
{% set kvm_instance_dict = {} -%}
{% set kvm_hostname_list = [] -%}
...
...
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