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
Stephane VAROQUI
slapos
Commits
5074021e
Commit
5074021e
authored
Jan 03, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set correctly url from slave instance
parent
4ef1c5d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
slapos/recipe/kvm_frontend/__init__.py
slapos/recipe/kvm_frontend/__init__.py
+4
-1
No files found.
slapos/recipe/kvm_frontend/__init__.py
View file @
5074021e
...
@@ -96,7 +96,8 @@ class Recipe(BaseSlapRecipe):
...
@@ -96,7 +96,8 @@ class Recipe(BaseSlapRecipe):
self
.
setConnectionDict
(
self
.
setConnectionDict
(
dict
(
site_url
=
"%s%s"
%
(
site_url
,
slave
[
'resource'
]),
dict
(
site_url
=
"%s%s"
%
(
site_url
,
slave
[
'resource'
]),
domainname
=
frontend_domain_name
,
domainname
=
frontend_domain_name
,
port
=
frontend_port_number
),
port
=
frontend_port_number
,
resource
=
slave
[
'resource'
]),
slave
[
'reference'
])
slave
[
'reference'
])
return
self
.
path_list
return
self
.
path_list
...
@@ -236,6 +237,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -236,6 +237,7 @@ class Recipe(BaseSlapRecipe):
)
)
def
_getProxyTableContent
(
self
,
rewrite_rule_list
):
def
_getProxyTableContent
(
self
,
rewrite_rule_list
):
"""Generate proxy table file content from rewrite rules list"""
proxy_table_content
=
'{'
proxy_table_content
=
'{'
for
rewrite_rule
in
rewrite_rule_list
:
for
rewrite_rule
in
rewrite_rule_list
:
rewrite_part
=
self
.
substituteTemplate
(
rewrite_part
=
self
.
substituteTemplate
(
...
@@ -248,6 +250,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -248,6 +250,7 @@ class Recipe(BaseSlapRecipe):
return
proxy_table_content
return
proxy_table_content
def
_getRewriteRuleContent
(
self
,
slave_instance_list
):
def
_getRewriteRuleContent
(
self
,
slave_instance_list
):
"""Generate rewrite rules list from slaves list"""
rewrite_rule_list
=
[]
rewrite_rule_list
=
[]
for
slave_instance
in
slave_instance_list
:
for
slave_instance
in
slave_instance_list
:
current_slave_dict
=
dict
()
current_slave_dict
=
dict
()
...
...
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