Merge "Add Nova extensions blacklisting"

This commit is contained in:
Jenkins 2016-06-11 00:40:46 +00:00 committed by Gerrit Code Review
commit 45f21eb38f
3 changed files with 24 additions and 0 deletions

View File

@ -155,6 +155,11 @@ horizon_swift_file_transfer_chunk_size: 524288
## Panel
horizon_default_panel: overview
# For blacklisting certain Nova extensions uncomment this configuration,
# and add necessary list items.
# horizon_nova_extensions_blacklist:
# - "SimpleTenantUsage"
## Customization module
## See http://docs.openstack.org/developer/horizon/topics/customizing.html#horizon-customization-module-overrides
# horizon_customization_module: /local/path/to/customization_module.py

View File

@ -0,0 +1,11 @@
---
features:
- |
Deployers can now blacklist certain Nova extensions
by providing a list of such extensions in
``horizon_nova_extensions_blacklist`` variable, for example:
.. code-block:: yaml
horizon_nova_extensions_blacklist:
- "SimpleTenantUsage"

View File

@ -711,6 +711,14 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES']
# http://tinyurl.com/anticlickjack
#DISALLOW_IFRAME_EMBED = True
{% if horizon_nova_extensions_blacklist is defined %}
OPENSTACK_NOVA_EXTENSIONS_BLACKLIST = [
{% for item in horizon_nova_extensions_blacklist %}
'{{ item }}',
{% endfor %}
]
{% endif %}
{% if horizon_site_name is defined %}
SITE_BRANDING = '{{ horizon_site_name }}'
{% endif %}