Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6

Changelog

@@ -1,3 +1,5 @@
+Next:
+    * bugfix: Fix flake8 error that was ignored in release 1.9.1
 1.9.1: 2018-06-24
     * #4799: [dcl] Show selected vm templates only in calculator (PR #638)
     * #4847: [comic] Add google analytics code for comic.ungleich.ch (PR #639)

datacenterlight/cms_models.py

@@ -3,6 +3,7 @@ from cms.extensions.extension_pool import extension_pool
 from cms.models.fields import PlaceholderField
 from cms.models.pluginmodel import CMSPlugin
 from django import forms
+from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
 from django.contrib.sites.models import Site
 from django.db import models
@@ -300,15 +301,17 @@ class MultipleChoiceArrayField(ArrayField):
     Uses Django's Postgres ArrayField
     and a MultipleChoiceField for its formfield.
     """
-    VMTemplateChoices = list(
+    VMTemplateChoices = []
-        (
+    if settings.OPENNEBULA_DOMAIN != 'test_domain':
-            str(obj.opennebula_vm_template_id),
+        VMTemplateChoices = list(
-            (obj.name + ' - ' + VMTemplate.IPV6.title()
+            (
-                if obj.vm_type == VMTemplate.IPV6 else obj.name
+                str(obj.opennebula_vm_template_id),
+                (obj.name + ' - ' + VMTemplate.IPV6.title()
+                    if obj.vm_type == VMTemplate.IPV6 else obj.name
+                 )
              )
-         )
+            for obj in VMTemplate.objects.all()
-        for obj in VMTemplate.objects.all()
+        )
-    )
 
     def formfield(self, **kwargs):
         defaults = {