aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into add_rss_feed_link

Browse source
This commit is contained in:
PCoder 2018-08-07 22:41:15 +02:00
commit a8bf22a5b9
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Changelog
View file

@ -1,6 +1,9 @@
Next:
* #5308: [ipv6only] Fix - when creating a VM, the name begins with v6only
* #5293: Use `terminate-hard` action instead of `terminate` in the opennebula call to terminate a vm
2.0.3: 2018-07-18 2.0.3: 2018-07-18
* Remove unused /comic url (PR #644) * Remove unused /comic url (PR #644)
* 5126: Allow dynamicweb sites to be iframed on other by setting `X_FRAME_OPTIONS_ALLOW_FROM_URI` (PR #645) * #5126: Allow dynamicweb sites to be iframed on other by setting `X_FRAME_OPTIONS_ALLOW_FROM_URI` (PR #645)
2.0.2: 2018-07-14 2.0.2: 2018-07-14
* bugfix: [blog] Add missing content block in the blog_ungleich.html template file * bugfix: [blog] Add missing content block in the blog_ungleich.html template file
2.0.1: 2018-07-14 2.0.1: 2018-07-14

2
opennebula_api/models.py
View file

@ -315,7 +315,7 @@ class OpenNebulaManager():
return vm_id return vm_id
def delete_vm(self, vm_id): def delete_vm(self, vm_id):
TERMINATE_ACTION = 'terminate' TERMINATE_ACTION = 'terminate-hard'
vm_terminated = False vm_terminated = False
try: try:
self.oneadmin_client.call( self.oneadmin_client.call(

3
opennebula_api/serializers.py
View file

@ -162,7 +162,10 @@ class VirtualMachineSerializer(serializers.Serializer):
return '-' return '-'
def get_name(self, obj): def get_name(self, obj):
if obj.name.startswith('public-'):
return obj.name.lstrip('public-') return obj.name.lstrip('public-')
else:
return obj.name
class VMTemplateSerializer(serializers.Serializer): class VMTemplateSerializer(serializers.Serializer):