Updated blazar enforcement filter template

Author: Mark-Powers

site-config/node_custom_config/blazar.conf

@@ -5,8 +5,15 @@ os_region_name = {{ openstack_region_name }}
 {# note: important to preserve newline after this #}
 exempt_projects = {% for project_id in blazar_usage_project_exemptions %}{{ project_id }}{% if not loop.last %},{% endif %}{% endfor %}
 
+{% set filters = [] %}
+{% if enable_blazar_max_lease_enforcement | bool %}
+{%   set _ = filters.append("MaxLeaseDurationFilter") %}
+{% endif %}
 {% if enable_blazar_allocation_enforcement | bool %}
-enabled_filters = MaxLeaseDurationFilter, ExternalServiceFilter
+{%   set _ = filters.append("ExternalServiceFilter") %}
+{% endif %}
+enabled_filters = {{ filters | join(", ") }}
+
 {% if blazar_external_service_endpoint is defined %}
 external_service_base_endpoint = {{ blazar_external_service_endpoint }}
 {% endif %}
@@ -19,9 +26,6 @@ external_service_check_update_endpoint = {{ blazar_external_service_check_update
 {% if blazar_external_service_on_end_endpoint is defined %}
 external_service_on_end_endpoint = {{ blazar_external_service_on_end_endpoint }}
 {% endif %}
-{% else %}
-enabled_filters = MaxLeaseDurationFilter
-{% endif %}
 max_lease_duration = {{ blazar_default_max_lease_duration }}
 reservation_extension_window = {{ blazar_default_reservation_extension_window }}