projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1804 - adding swap disks
[osm/RO.git]
/
RO-VIM-openstack
/
osm_rovim_openstack
/
vimconn_openstack.py
diff --git
a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index
297e14b
..
4869da1
100644
(file)
--- a/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@
-1178,6
+1178,7
@@
class vimconnector(vimconn.VimConnector):
flavor_dict["vcpus"],
flavor_dict["disk"],
flavor_dict.get("ephemeral", 0),
flavor_dict["vcpus"],
flavor_dict["disk"],
flavor_dict.get("ephemeral", 0),
+ flavor_dict.get("swap", 0),
)
# numa=None
extended = flavor_dict.get("extended", {})
)
# numa=None
extended = flavor_dict.get("extended", {})
@@
-1202,6
+1203,7
@@
class vimconnector(vimconn.VimConnector):
flavor.vcpus,
flavor.disk,
flavor.ephemeral,
flavor.vcpus,
flavor.disk,
flavor.ephemeral,
+ flavor.swap,
)
if flavor_data == flavor_target:
return flavor.id
)
if flavor_data == flavor_target:
return flavor.id
@@
-1357,6
+1359,7
@@
class vimconnector(vimconn.VimConnector):
vcpus=vcpus,
disk=flavor_data.get("disk", 0),
ephemeral=flavor_data.get("ephemeral", 0),
vcpus=vcpus,
disk=flavor_data.get("disk", 0),
ephemeral=flavor_data.get("ephemeral", 0),
+ swap=flavor_data.get("swap", 0),
is_public=flavor_data.get("is_public", True),
)
# add metadata
is_public=flavor_data.get("is_public", True),
)
# add metadata