Merge "Added variable to allow for arbitrary HORIZON_CONFIG"

This commit is contained in:
Jenkins 2016-07-07 11:06:14 +00:00 committed by Gerrit Code Review
commit 5617c4de57
4 changed files with 15 additions and 0 deletions

View File

@ -191,3 +191,6 @@ horizon_pip_packages:
- pycrypto
- python-memcached
- python-keystoneclient
# Set arbitrary horizon configuration options
horizon_config_overrides: {}

View File

@ -0,0 +1,6 @@
---
features:
- Horizon now has the ability to set arbitrary configuration options using
global option ``horizon_config_overrides`` in YAML format. The overrides
follow the same pattern found within the other OpenStack service
overrides. `General documentation on overrides can be found here <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-openstack.html#overriding-openstack-configuration-defaults>`_.

View File

@ -728,3 +728,7 @@ SITE_BRANDING = '{{ horizon_site_name }}'
#custom python module with horizon dashboard theme overrides
HORIZON_CONFIG["customization_module"] = 'horizon_customization.overrides'
{% endif %}
# Set arbitrary horizon configuration options
HORIZON_CONFIG.update({{ horizon_config_overrides }})

View File

@ -84,3 +84,5 @@ tempest_plugins:
- name: tempest-horizon
repo: https://git.openstack.org/openstack/tempest-horizon
branch: master
horizon_config_overrides:
X_TEST_OPTION: True