Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
631d0f12
authored
Jun 17, 2018
by
Szabolcs Gelencser
Committed by
Szabolcs Gelencsér
Jun 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 'save vm as template' operation (make_it_shared)
parent
f6975613
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
circle/circle/settings/base.py
+1
-1
circle/vm/operations.py
+1
-1
No files found.
circle/circle/settings/base.py
View file @
631d0f12
...
@@ -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
...
...
circle/vm/operations.py
View file @
631d0f12
...
@@ -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(
...
...
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