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
HongzheWang
slapos
Commits
effa3a5f
Commit
effa3a5f
authored
Mar 04, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: fix VNC frontend software url
parent
390aa835
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
software/kvm/common.cfg
software/kvm/common.cfg
+2
-2
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+2
-2
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+2
-2
No files found.
software/kvm/common.cfg
View file @
effa3a5f
...
@@ -98,7 +98,7 @@ mode = 0644
...
@@ -98,7 +98,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
mode = 644
md5sum =
88e1437391d21a49b50848689b1221e5
md5sum =
e72f42d880877a841e87908566c28610
download-only = true
download-only = true
on-update = true
on-update = true
...
@@ -106,7 +106,7 @@ on-update = true
...
@@ -106,7 +106,7 @@ on-update = true
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
mode = 644
mode = 644
md5sum =
f61e033aedaa8e9836795e36fd12e51d
md5sum =
6e81c08669e164b852bd8d062c620de2
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
effa3a5f
...
@@ -34,7 +34,7 @@ state = stopped
...
@@ -34,7 +34,7 @@ state = stopped
config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http
s://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92
/software/kvm/software.cfg')) }}
config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http
://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:
/software/kvm/software.cfg')) }}
config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
config-name = {{ instance_name }}
config-name = {{ instance_name }}
{% if slapparameter_dict.get('authorized-keys', []) -%}
{% if slapparameter_dict.get('authorized-keys', []) -%}
...
@@ -226,4 +226,4 @@ parts =
...
@@ -226,4 +226,4 @@ parts =
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
offline = true
\ No newline at end of file
software/kvm/instance-kvm.cfg.jinja2
View file @
effa3a5f
...
@@ -533,7 +533,7 @@ backup = ${logrotate:backup}
...
@@ -533,7 +533,7 @@ backup = ${logrotate:backup}
[slap-parameter]
[slap-parameter]
# Default values if not specified
# Default values if not specified
frontend-software-type = frontend
frontend-software-type = frontend
frontend-software-url = http
s://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92
/software/kvm/software.cfg
frontend-software-url = http
://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:
/software/kvm/software.cfg
frontend-instance-guid =
frontend-instance-guid =
frontend-instance-name = VNC Frontend
frontend-instance-name = VNC Frontend
nbd-port = 1024
nbd-port = 1024
...
@@ -648,4 +648,4 @@ extends =
...
@@ -648,4 +648,4 @@ extends =
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
offline = true
\ No newline at end of file
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