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 1801 - adding ephemeral 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
c59bf90
..
297e14b
100644
(file)
--- a/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@
-864,6
+864,14
@@
class vimconnector(vimconn.VimConnector):
if self.config.get("disable_network_port_security"):
network_dict["port_security_enabled"] = False
if self.config.get("disable_network_port_security"):
network_dict["port_security_enabled"] = False
+ if self.config.get("neutron_availability_zone_hints"):
+ hints = self.config.get("neutron_availability_zone_hints")
+
+ if isinstance(hints, str):
+ hints = [hints]
+
+ network_dict["availability_zone_hints"] = hints
+
new_net = self.neutron.create_network({"network": network_dict})
# print new_net
# create subnetwork, even if there is no profile
new_net = self.neutron.create_network({"network": network_dict})
# print new_net
# create subnetwork, even if there is no profile
@@
-1169,6
+1177,7
@@
class vimconnector(vimconn.VimConnector):
flavor_dict["ram"],
flavor_dict["vcpus"],
flavor_dict["disk"],
flavor_dict["ram"],
flavor_dict["vcpus"],
flavor_dict["disk"],
+ flavor_dict.get("ephemeral", 0),
)
# numa=None
extended = flavor_dict.get("extended", {})
)
# numa=None
extended = flavor_dict.get("extended", {})
@@
-1188,7
+1197,12
@@
class vimconnector(vimconn.VimConnector):
continue
# TODO
continue
# TODO
- flavor_data = (flavor.ram, flavor.vcpus, flavor.disk)
+ flavor_data = (
+ flavor.ram,
+ flavor.vcpus,
+ flavor.disk,
+ flavor.ephemeral,
+ )
if flavor_data == flavor_target:
return flavor.id
elif (
if flavor_data == flavor_target:
return flavor.id
elif (
@@
-1338,10
+1352,11
@@
class vimconnector(vimconn.VimConnector):
# create flavor
new_flavor = self.nova.flavors.create(
# create flavor
new_flavor = self.nova.flavors.create(
- name,
- ram,
- vcpus,
- flavor_data.get("disk", 0),
+ name=name,
+ ram=ram,
+ vcpus=vcpus,
+ disk=flavor_data.get("disk", 0),
+ ephemeral=flavor_data.get("ephemeral", 0),
is_public=flavor_data.get("is_public", True),
)
# add metadata
is_public=flavor_data.get("is_public", True),
)
# add metadata