diff options
Diffstat (limited to 'sdnvpn/lib')
| -rw-r--r-- | sdnvpn/lib/openstack_utils.py | 2 | ||||
| -rw-r--r-- | sdnvpn/lib/utils.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sdnvpn/lib/openstack_utils.py b/sdnvpn/lib/openstack_utils.py index 49771d5..fd29c87 100644 --- a/sdnvpn/lib/openstack_utils.py +++ b/sdnvpn/lib/openstack_utils.py @@ -361,7 +361,7 @@ def create_flavor(nova_client, flavor_name, ram, disk, vcpus, public=True): flavor = nova_client.flavors.create( flavor_name, ram, vcpus, disk, is_public=public) try: - extra_specs = getattr(config.CONF, 'flavor_extra_specs') + extra_specs = {'hw:mem_page_size':'large'} flavor.set_keys(extra_specs) except ValueError: # flavor extra specs are not configured, therefore skip the update diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index ac7ffb7..8fde5e4 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -686,10 +686,7 @@ def cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, def cleanup_nova(nova_client, instance_ids, flavor_ids=None): if flavor_ids is not None and len(flavor_ids) != 0: for flavor_id in flavor_ids: - if not nova_client.flavors.delete(flavor_id): - logging.error('Fail to delete flavor. ' - 'Flavor with id {} was not deleted.'. - format(flavor_id)) + nova_client.flavors.delete(flavor_id) if len(instance_ids) != 0: for instance_id in instance_ids: if not os_utils.delete_instance(nova_client, instance_id): |