Merge branch 'master' into add_rss_feed_link

Changelog

@@ -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
     * 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
     * bugfix: [blog] Add missing content block in the blog_ungleich.html template file
 2.0.1: 2018-07-14

opennebula_api/models.py

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

opennebula_api/serializers.py

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