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
7157b2b2
Commit
7157b2b2
authored
Jan 02, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify
parent
0aa9d7e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
slapos/recipe/kvm/__init__.py
slapos/recipe/kvm/__init__.py
+5
-6
No files found.
slapos/recipe/kvm/__init__.py
View file @
7157b2b2
...
...
@@ -99,17 +99,16 @@ class Recipe(BaseSlapRecipe):
#request_frontend = self.parameter_dict.get('frontend', True)
if
not
request_frontend
in
FALSE_VALUE_LIST
:
slave_frontend
=
self
.
request
(
# XXX-Cedric : how to "de-hardcode" url?
# XXX-Cedric : Use KVM Software Type to instantiate kvmfrontend.
# kvmfrontend should be in KVM recipe but using different
# software type.
software_release
=
'/opt/slapdev/software/kvm-frontend/software.cfg'
,
software_type
=
'RootInstanceSoftware'
,
partition_reference
=
'%s_frontend'
%
self
.
computer_partition_id
,
shared
=
True
)
url
=
'https://%s:%s/%s/vnc_auto.html?host=%s&port=%s&encrypt=1&path=%s'
%
(
# XXX-Cedric : uh? how to fetch slave reference?
slave_frontend
.
get
(
'connection_xml'
).
getParameter
(
'domainname'
),
slave_frontend
.
get
(
'connection_xml'
).
getParameter
(
'port'
),
slave_frontend
.
get
(
'slave_reference'
),
url
=
'%s/vnc_auto.html?host=%s&port=%s&encrypt=1&path=%s'
%
(
slave_frontend
.
get
(
'connection_xml'
).
getParameter
(
'site_url'
),
slave_frontend
.
get
(
'connection_xml'
).
getParameter
(
'domainname'
),
slave_frontend
.
get
(
'connection_xml'
).
getParameter
(
'port'
),
slave_frontend
.
get
(
'slave_reference'
))
...
...
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