Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
cc6205bd
authored
Apr 21, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: fix Interface.create
parent
1a2eab74
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
circle/firewall/admin.py
+1
-1
circle/vm/models/network.py
+2
-2
No files found.
circle/firewall/admin.py
View file @
cc6205bd
...
@@ -38,7 +38,7 @@ class HostAdmin(admin.ModelAdmin):
...
@@ -38,7 +38,7 @@ class HostAdmin(admin.ModelAdmin):
class
HostInline
(
contrib
.
admin
.
TabularInline
):
class
HostInline
(
contrib
.
admin
.
TabularInline
):
model
=
Host
model
=
Host
fields
=
(
'hostname'
,
'ipv4'
,
'ipv6'
,
'
pub
_ipv4'
,
'mac'
,
'shared_ip'
,
fields
=
(
'hostname'
,
'ipv4'
,
'ipv6'
,
'
external
_ipv4'
,
'mac'
,
'shared_ip'
,
'owner'
,
'reverse'
)
'owner'
,
'reverse'
)
...
...
circle/vm/models/network.py
View file @
cc6205bd
...
@@ -120,10 +120,10 @@ class Interface(Model):
...
@@ -120,10 +120,10 @@ class Interface(Model):
host
.
owner
=
owner
host
.
owner
=
owner
if
vlan
.
network_type
==
'public'
:
if
vlan
.
network_type
==
'public'
:
host
.
shared_ip
=
False
host
.
shared_ip
=
False
host
.
pub
_ipv4
=
None
host
.
external
_ipv4
=
None
elif
vlan
.
network_type
==
'portforward'
:
elif
vlan
.
network_type
==
'portforward'
:
host
.
shared_ip
=
True
host
.
shared_ip
=
True
host
.
pub
_ipv4
=
vlan
.
snat_ip
host
.
external
_ipv4
=
vlan
.
snat_ip
host
.
full_clean
()
host
.
full_clean
()
host
.
save
()
host
.
save
()
host
.
enable_net
()
host
.
enable_net
()
...
...
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