Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0eb6f901
authored
Oct 18, 2013
by
Guba Sándor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: fixing network ip addresses and refresh libvirt states
parent
b1bfe87f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
circle/vm/models.py
+2
-3
No files found.
circle/vm/models.py
View file @
0eb6f901
...
@@ -549,7 +549,6 @@ class Instance(BaseResourceConfigModel, TimeStampedModel):
...
@@ -549,7 +549,6 @@ class Instance(BaseResourceConfigModel, TimeStampedModel):
disk
.
deploy
()
disk
.
deploy
()
queue_name
=
self
.
get_remote_queue_name
(
'vm'
)
queue_name
=
self
.
get_remote_queue_name
(
'vm'
)
# Deploy VM on remote machine
# Deploy VM on remote machine
with
act
.
sub_activity
(
'deploying_vm'
):
with
act
.
sub_activity
(
'deploying_vm'
):
vm_tasks
.
create
.
apply_async
(
args
=
[
self
.
get_vm_desc
()],
vm_tasks
.
create
.
apply_async
(
args
=
[
self
.
get_vm_desc
()],
...
@@ -795,8 +794,8 @@ class Interface(Model):
...
@@ -795,8 +794,8 @@ class Interface(Model):
'name'
:
self
.
__unicode__
(),
'name'
:
self
.
__unicode__
(),
'bridge'
:
'cloud'
,
'bridge'
:
'cloud'
,
'mac'
:
str
(
self
.
mac
),
'mac'
:
str
(
self
.
mac
),
'ipv4'
:
s
elf
.
host
.
ipv4
if
self
.
host
is
not
None
else
None
,
'ipv4'
:
s
tr
(
self
.
host
.
ipv4
)
if
self
.
host
is
not
None
else
None
,
'ipv6'
:
s
elf
.
host
.
ipv6
if
self
.
host
is
not
None
else
None
,
'ipv6'
:
s
tr
(
self
.
host
.
ipv6
)
if
self
.
host
is
not
None
else
None
,
'vlan'
:
self
.
vlan
.
vid
,
'vlan'
:
self
.
vlan
.
vid
,
'managed'
:
self
.
host
is
not
None
'managed'
:
self
.
host
is
not
None
}
}
...
...
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