Commit 631d0f12 by Szabolcs Gelencser Committed by Szabolcs Gelencsér

Fix 'save vm as template' operation (make_it_shared)

parent f6975613
...@@ -600,7 +600,7 @@ DEFAULT_PUBLIC_ROUTER_NAME_FOR_USER = "default_public" ...@@ -600,7 +600,7 @@ DEFAULT_PUBLIC_ROUTER_NAME_FOR_USER = "default_public"
DEFAULT_PUBLIC_ROUTED_NET_NAME_FOR_USER = "default_public_routed" DEFAULT_PUBLIC_ROUTED_NET_NAME_FOR_USER = "default_public_routed"
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN="bme" OPENSTACK_KEYSTONE_DEFAULT_DOMAIN="bme"
OPENSTACK_KEYSTONE_URL="https://oscircle.guest.ik.bme.hu:5000" OPENSTACK_KEYSTONE_URL="https://proxy.bmec4e.niif.hu:5000"
WEBSSO_ENABLED = True #TODO: it is always enabled, refactor openstack_auth WEBSSO_ENABLED = True #TODO: it is always enabled, refactor openstack_auth
OPENSTACK_SSL_NO_VERIFY = True OPENSTACK_SSL_NO_VERIFY = True
......
...@@ -531,7 +531,6 @@ class SaveAsTemplateOperation(InstanceOperation): ...@@ -531,7 +531,6 @@ class SaveAsTemplateOperation(InstanceOperation):
with_shutdown=True, clone=False, task=None, **kwargs): with_shutdown=True, clone=False, task=None, **kwargs):
template_image_id = openstack_api.nova.snapshot_create(request, self.instance.id, name) template_image_id = openstack_api.nova.snapshot_create(request, self.instance.id, name)
template.make_it_shared(request)
template = InstanceTemplate( template = InstanceTemplate(
name=name, name=name,
image_id=template_image_id, image_id=template_image_id,
...@@ -539,6 +538,7 @@ class SaveAsTemplateOperation(InstanceOperation): ...@@ -539,6 +538,7 @@ class SaveAsTemplateOperation(InstanceOperation):
owner_id=user.tenant_id, owner_id=user.tenant_id,
lease=VmLease.get_or_create_lease(self.instance).lease lease=VmLease.get_or_create_lease(self.instance).lease
) )
template.make_it_shared(request)
template.save() template.save()
# return create_readable( # return create_readable(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment