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
Rafael Monnerat
slapos
Commits
5c9da475
Commit
5c9da475
authored
Aug 12, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resiliency: fix takeover script.
parent
4cf7c477
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
slapos/recipe/addresiliency/takeover.py
slapos/recipe/addresiliency/takeover.py
+8
-8
No files found.
slapos/recipe/addresiliency/takeover.py
View file @
5c9da475
...
@@ -33,7 +33,7 @@ def takeover(server_url, key_file, cert_file, computer_guid,
...
@@ -33,7 +33,7 @@ def takeover(server_url, key_file, cert_file, computer_guid,
winner_instance_name
=
namebase
+
winner_instance_suffix
winner_instance_name
=
namebase
+
winner_instance_suffix
# XXX: we hardcode a lot of values here, because request is a settergetter, all at once.
# XXX: we hardcode a lot of values here, because request is a settergetter, all at once.
cp_winner
=
current_partition
.
request
(
software_release
=
software_release
,
cp_winner
=
current_partition
.
request
(
software_release
=
software_release
,
software_type
=
'
importer'
,
software_type
=
'
%s-import'
%
namebase
,
partition_reference
=
winner_instance_name
)
partition_reference
=
winner_instance_name
)
else
:
else
:
# This script is run in the winning partition: use this one as winner
# This script is run in the winning partition: use this one as winner
...
@@ -65,11 +65,11 @@ def takeover(server_url, key_file, cert_file, computer_guid,
...
@@ -65,11 +65,11 @@ def takeover(server_url, key_file, cert_file, computer_guid,
# and parameters.)
# and parameters.)
def
run
(
args
):
def
run
(
args
):
slapos
.
recipe
.
addresiliency
.
renamer
.
Renam
er
(
server_url
=
args
.
pop
(
'server_url'
),
slapos
.
recipe
.
addresiliency
.
takeover
.
takeov
er
(
server_url
=
args
.
pop
(
'server_url'
),
key_file
=
args
.
pop
(
'key_file'
),
key_file
=
args
.
pop
(
'key_file'
),
cert_file
=
args
.
pop
(
'cert_file'
),
cert_file
=
args
.
pop
(
'cert_file'
),
computer_guid
=
args
.
pop
(
'computer_id'
),
computer_guid
=
args
.
pop
(
'computer_id'
),
partition_id
=
args
.
pop
(
'partition_id'
),
partition_id
=
args
.
pop
(
'partition_id'
),
software_release
=
args
.
pop
(
'software'
),
software_release
=
args
.
pop
(
'software'
),
namebase
=
args
.
pop
(
'namebase'
))
namebase
=
args
.
pop
(
'namebase'
))
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