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
Georgios Dagkakis
slapos
Commits
c9fae85c
Commit
c9fae85c
authored
Feb 02, 2017
by
Rafael Monnerat
👻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
recipe/re6stnet: getIPv4Information was simplifed on registry.
parent
47f34c1e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
slapos/recipe/re6stnet/re6stnet.py
slapos/recipe/re6stnet/re6stnet.py
+2
-8
No files found.
slapos/recipe/re6stnet/re6stnet.py
View file @
c9fae85c
...
...
@@ -206,13 +206,7 @@ def checkService(args, can_bang=True):
log
.
info
(
"%s, IPV6 = %s"
%
(
slave_reference
,
ipv6
))
log
.
info
(
"Dumping ipv4..."
)
try
:
ipv4
=
"0.0.0.0"
ipv6_prefix
=
client
.
getIPv6Prefix
(
str
(
email
))
if
not
int
(
ipv6_prefix
)
==
0
:
if
client
.
isPeer
(
ipv6_prefix
):
ipv4
=
client
.
getIPv4Information
(
ipv6_prefix
)
log
.
info
(
"Found ipv4: %s"
%
ipv4
)
ipv4
=
client
.
getIPv4Information
(
str
(
email
))
or
"0.0.0.0"
ipv4_file
=
os
.
path
.
join
(
base_token_path
,
'%s.ipv4'
%
slave_reference
)
ipv4_changed
=
updateFile
(
ipv4_file
,
ipv4
)
except
Exception
:
...
...
@@ -220,7 +214,7 @@ def checkService(args, can_bang=True):
traceback
.
format_exc
()))
continue
log
.
info
(
"%s, IPV4 = %s
, IPV6_PREFIX = %s"
%
(
slave_reference
,
ipv4
,
ipv6_prefix
))
log
.
info
(
"%s, IPV4 = %s
"
%
(
slave_reference
,
ipv4
))
except
IOError
:
log
.
debug
(
'Error when writing in file %s. Could not update status of %s...'
%
...
...
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