Merge "Provide a default for OPENSTACK_IMAGE_BACKEND"

doc/source/topics/settings.rst

@@ -133,8 +133,8 @@ pool from which the IP should be allocated and to select a specific IP address
 when associating one with an instance.
 
 
-OpenStack Settings
-==================
+OpenStack Settings (Partial)
+============================
 
 The following settings inform the OpenStack Dashboard of information about the
 other OpenStack projects which are part of this cloud and control the behavior
@@ -262,12 +262,23 @@ define the policy rules actions are verified against.
 ``POLICY_FILES``
 ----------------
 
-Default: { 'identity': 'keystone_policy.json', 'compute': 'nova_policy.json'}
+Default: ``{ 'identity': 'keystone_policy.json', 'compute': 'nova_policy.json'}``
 
 This should essentially be the mapping of the contents of ``POLICY_FILES_PATH``
 to service types.  When policy.json files are added to ``POLICY_FILES_PATH``,
 they should be included here too.
 
+``OPENSTACK_IMAGE_BACKEND``
+---------------------------
+
+Default: ``{ 'image_formats': [('', ''), ('aki', _('AKI - Amazon Kernel Image')),
+('ami', _('AMI - Amazon Machine Image')), ('ari', _('ARI - Amazon Ramdisk Image')),
+('iso', _('ISO - Optical Disk Image')), ('qcow2', _('QCOW2 - QEMU Emulator')),
+('raw', _('Raw')), ('vdi', _('VDI')), ('vhd', _('VHD')), ('vmdk', _('VMDK'))] }``
+
+Used to customize features related to the image service, such as the list of
+supported image formats.
+
 Django Settings (Partial)
 =========================
 

openstack_dashboard/local/local_settings.py.example

@@ -172,20 +172,20 @@ OPENSTACK_NEUTRON_NETWORK = {
 # The OPENSTACK_IMAGE_BACKEND settings can be used to customize features
 # in the OpenStack Dashboard related to the Image service, such as the list
 # of supported image formats.
-OPENSTACK_IMAGE_BACKEND = {
-    'image_formats': [
-        ('', ''),
-        ('aki', _('AKI - Amazon Kernel Image')),
-        ('ami', _('AMI - Amazon Machine Image')),
-        ('ari', _('ARI - Amazon Ramdisk Image')),
-        ('iso', _('ISO - Optical Disk Image')),
-        ('qcow2', _('QCOW2 - QEMU Emulator')),
-        ('raw', _('Raw')),
-        ('vdi', _('VDI')),
-        ('vhd', _('VHD')),
-        ('vmdk', _('VMDK'))
-    ]
-}
+# OPENSTACK_IMAGE_BACKEND = {
+#     'image_formats': [
+#         ('', ''),
+#         ('aki', _('AKI - Amazon Kernel Image')),
+#         ('ami', _('AMI - Amazon Machine Image')),
+#         ('ari', _('ARI - Amazon Ramdisk Image')),
+#         ('iso', _('ISO - Optical Disk Image')),
+#         ('qcow2', _('QCOW2 - QEMU Emulator')),
+#         ('raw', _('Raw')),
+#         ('vdi', _('VDI')),
+#         ('vhd', _('VHD')),
+#         ('vmdk', _('VMDK'))
+#     ]
+# }
 
 # OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints
 # in the Keystone service catalog. Use this setting when Horizon is running

openstack_dashboard/settings.py

@@ -23,6 +23,8 @@ import os
 import sys
 import warnings
 
+from django.utils.translation import ugettext_lazy as _  # noqa
+
 from openstack_dashboard import exceptions
 
 warnings.formatwarning = lambda message, category, *args, **kwargs: \
@@ -82,6 +84,24 @@ HORIZON_CONFIG = {
 # See documentation for deployment considerations.
 HORIZON_IMAGES_ALLOW_UPLOAD = True
 
+# The OPENSTACK_IMAGE_BACKEND settings can be used to customize features
+# in the OpenStack Dashboard related to the Image service, such as the list
+# of supported image formats.
+OPENSTACK_IMAGE_BACKEND = {
+    'image_formats': [
+        ('', ''),
+        ('aki', _('AKI - Amazon Kernel Image')),
+        ('ami', _('AMI - Amazon Machine Image')),
+        ('ari', _('ARI - Amazon Ramdisk Image')),
+        ('iso', _('ISO - Optical Disk Image')),
+        ('qcow2', _('QCOW2 - QEMU Emulator')),
+        ('raw', _('Raw')),
+        ('vdi', _('VDI')),
+        ('vhd', _('VHD')),
+        ('vmdk', _('VMDK'))
+    ]
+}
+
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',