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
Lorenzo Martinico
slapos
Commits
d66ea6d3
Commit
d66ea6d3
authored
Aug 08, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
KVM SR: fix tunnel generation.
Was tunnelling to the wrong port.
parent
718fb62f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
slapos/recipe/kvm/__init__.py
slapos/recipe/kvm/__init__.py
+4
-4
No files found.
slapos/recipe/kvm/__init__.py
View file @
d66ea6d3
...
...
@@ -48,16 +48,16 @@ class Recipe(GenericBaseRecipe):
if
not
self
.
isTrueValue
(
self
.
options
.
get
(
'use-tap'
)):
# XXX This could be done using Jinja.
for
port
in
self
.
options
[
'nat-rules'
].
split
():
ipv6
_port
=
int
(
port
)
+
10000
tunnel
_port
=
int
(
port
)
+
10000
tunnel_path
=
self
.
createExecutable
(
'%s-%s
to%s'
%
(
self
.
options
[
'6tunnel-wrapper-path'
],
port
,
ipv6
_port
),
'%s-%s
'
%
(
self
.
options
[
'6tunnel-wrapper-path'
],
tunnel
_port
),
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'6to4.in'
),
{
'ipv6'
:
self
.
options
[
'ipv6'
],
'ipv6_port'
:
ipv6
_port
,
'ipv6_port'
:
tunnel
_port
,
'ipv4'
:
self
.
options
[
'ipv4'
],
'ipv4_port'
:
port
,
'ipv4_port'
:
tunnel_
port
,
'shell_path'
:
self
.
options
[
'shell-path'
],
'6tunnel_path'
:
self
.
options
[
'6tunnel-path'
],
},
...
...
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