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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
slapos
Commits
a3ab38bb
Commit
a3ab38bb
authored
Dec 09, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slave_instance is dict
Use it as dict and not as instance object
parent
ee8e92db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
15 deletions
+12
-15
slapos/recipe/kvm/__init__.py
slapos/recipe/kvm/__init__.py
+6
-6
slapos/recipe/kvm_frontend/__init__.py
slapos/recipe/kvm_frontend/__init__.py
+6
-9
No files found.
slapos/recipe/kvm/__init__.py
View file @
a3ab38bb
...
@@ -107,12 +107,12 @@ class Recipe(BaseSlapRecipe):
...
@@ -107,12 +107,12 @@ class Recipe(BaseSlapRecipe):
)
)
url
=
'https://%s:%s/%s/vnc_auto.html?host=%s&port=%s&encrypt=1&path=%s'
%
(
url
=
'https://%s:%s/%s/vnc_auto.html?host=%s&port=%s&encrypt=1&path=%s'
%
(
# XXX-Cedric : uh? how to fetch slave reference?
# XXX-Cedric : uh? how to fetch slave reference?
slave_frontend
.
getParameter
(
'domainname'
),
slave_frontend
.
get
(
'connection_xml'
).
get
Parameter
(
'domainname'
),
slave_frontend
.
getParameter
(
'port'
),
slave_frontend
.
get
(
'connection_xml'
).
get
Parameter
(
'port'
),
slave_frontend
.
get
(
'reference'
),
slave_frontend
.
get
(
'
slave_
reference'
),
slave_frontend
.
getParameter
(
'domainname'
),
slave_frontend
.
get
(
'connection_xml'
).
get
Parameter
(
'domainname'
),
slave_frontend
.
getParameter
(
'port'
),
slave_frontend
.
get
(
'connection_xml'
).
get
Parameter
(
'port'
),
slave_frontend
.
get
(
'reference'
))
slave_frontend
.
get
(
'
slave_
reference'
))
connection_dict
=
dict
(
connection_dict
=
dict
(
url
=
url
,
url
=
url
,
backend_url
=
ipv6_url
,
backend_url
=
ipv6_url
,
...
...
slapos/recipe/kvm_frontend/__init__.py
View file @
a3ab38bb
...
@@ -109,22 +109,19 @@ class Recipe(BaseSlapRecipe):
...
@@ -109,22 +109,19 @@ class Recipe(BaseSlapRecipe):
rewrite_rule_list
=
rewrite_rule_list
,
rewrite_rule_list
=
rewrite_rule_list
,
key
=
key
,
certificate
=
certificate
)
key
=
key
,
certificate
=
certificate
)
for
reference
,
url
in
slave_dict
.
iteritems
():
self
.
setConnectionDict
(
dict
(
site_url
=
url
),
reference
)
# Send connection parameters of master instance
# Send connection parameters of master instance
self
.
setConnectionDict
(
self
.
setConnectionDict
(
dict
(
site_url
=
node_parameter_dict
[
'site_url'
],
dict
(
site_url
=
node_parameter_dict
[
'site_url'
],
domain_ipv6_address
=
self
.
getGlobalIPv6Address
()))
domain_ipv6_address
=
self
.
getGlobalIPv6Address
()))
# Send connection parameters of slave instances
# Send connection parameters of slave instances
for
slave_instance
in
slave_
instance_list
:
for
slave_instance
in
slave_
dict
.
iteritems
()
:
slave_site_url
=
'%s%s'
%
(
node_parameter_dict
[
'site_url'
],
slave_site_url
=
'%s%s'
%
(
node_parameter_dict
[
'site_url'
],
# XXX-Cedric reference?
slave_instance
.
get
(
'reference'
))
slave_instance
.
get
(
'reference'
))
slave_instance
.
setConnectionDict
(
self
.
setConnectionDict
(
dict
(
site_url
=
slave_site_url
,
dict
(
site_url
=
slave_site_url
,
domainname
=
frontend_domain_name
),
domainname
=
frontend_domain_name
,
port
=
frontend_port_number
)
port
=
frontend_port_number
),
slave_instance
.
get
(
'slave_reference'
))
return
self
.
path_list
return
self
.
path_list
...
...
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