openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Sort key-value pairs in local_settings dictionaries

Browse Source 
The AVAILABLE_THEMES and LAUNCH_INSTANCE_DEFAULTS options are currently
templated as unsorted dictionaries. Sort them to avoid unnecessary
config changes and service restarts.

Change-Id: I7bfd5248be78efa3a87bd56637ea1082d391a3e0
This commit is contained in:
Jimmy McCrory 2017-07-19 11:31:39 -07:00
parent 4970cd1a2a
commit fb66ce62a9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
templates/horizon_local_settings.py.j2
View File

@ -249,7 +249,12 @@ LAUNCH_INSTANCE_NG_ENABLED = {{ horizon_launch_instance_ng }}
# A dictionary of settings which can be used to provide the default values for # A dictionary of settings which can be used to provide the default values for
# properties found in the Launch Instance modal. # properties found in the Launch Instance modal.
LAUNCH_INSTANCE_DEFAULTS = {{ horizon_launch_instance_defaults }} LAUNCH_INSTANCE_DEFAULTS = {
{%- for key, value in (horizon_launch_instance_defaults | dictsort) %}
'{{ key }}': {{ value }}
{%- if not loop.last %}, {% endif %}
{%- endfor %}
}
# The Xen Hypervisor has the ability to set the mount point for volumes # The Xen Hypervisor has the ability to set the mount point for volumes
# attached to instances (other Hypervisors currently do not). Setting # attached to instances (other Hypervisors currently do not). Setting
@ -773,10 +778,10 @@ HORIZON_CONFIG["customization_module"] = 'horizon_customization.overrides'
{% endif %} {% endif %}
AVAILABLE_THEMES = [ AVAILABLE_THEMES = [
{% for key, value in _horizon_available_themes.items() %} {% for key, value in (_horizon_available_themes | dictsort) %}
('{{ value.theme_name }}', '{{ value.theme_label }}', '{{ value.theme_path }}'), ('{{ value.theme_name }}', '{{ value.theme_label }}', '{{ value.theme_path }}'),
{% endfor %} {% endfor %}
{% for key, value in horizon_custom_themes.items() %} {% for key, value in (horizon_custom_themes | dictsort) %}
('{{ value.theme_name }}', '{{ value.theme_label }}', '{{ value.theme_path }}'), ('{{ value.theme_name }}', '{{ value.theme_label }}', '{{ value.theme_path }}'),
{% endfor %} {% endfor %}
] ]