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
Leo Le Bouter
slapos
Commits
b00701b5
Commit
b00701b5
authored
Jun 20, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[kvm]: fix nat-rule-url for kvm-cluster
parent
712f5c60
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+6
-1
No files found.
software/kvm/buildout.hash.cfg
View file @
b00701b5
...
@@ -23,7 +23,7 @@ md5sum = 26a947c75792072a7b526cb18b617b10
...
@@ -23,7 +23,7 @@ md5sum = 26a947c75792072a7b526cb18b617b10
[template-kvm-cluster]
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
filename = instance-kvm-cluster.cfg.jinja2.in
md5sum =
63fa784d8946d0b6e3fbd6381e1ea9f4
md5sum =
2bbee46d39aec87e92c8462efab292b6
[template-kvm-resilient]
[template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2
filename = instance-kvm-resilient.cfg.jinja2
...
...
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
b00701b5
...
@@ -129,7 +129,12 @@ return =
...
@@ -129,7 +129,12 @@ return =
backend-url
backend-url
{% if str(use_nat).lower() == 'true' -%}
{% if str(use_nat).lower() == 'true' -%}
{% for port in nat_rules_list -%}
{% for port in nat_rules_list -%}
{{ ' ' }}nat-rule-url-{{ port }}
{% if ':' in port -%}
{% set proto, port = port.split(':') -%}
{% else -%}
{% set proto, port = 'tcp', port -%}
{% endif -%}
{{ ' ' }}nat-rule-url-{{proto}}-{{ port }}
{% endfor -%}
{% endfor -%}
{% endif -%}
{% endif -%}
{{ ' ' }}monitor-base-url
{{ ' ' }}monitor-base-url
...
...
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