From 7732884d372af7da03583823995a427ac79ca8d3 Mon Sep 17 00:00:00 2001 From: kaz_shinohara Date: Fri, 23 Feb 2018 16:25:32 +0900 Subject: [PATCH] Rename API_TIMEOUT and API_PARALLEL vars API_TIMEOUT and API_PARALLEL, both of them are for template generator and the naming looks too generic. This is not good because they will be global under django. It's better to rename them to indicate both parameters for heat-dashboard. Change-Id: I1ad610fd796d158174ae9cb855bd5d8da72bc1f8 Closes-Bug: #1750930 --- heat_dashboard/content/template_generator/api.py | 4 ++-- .../local_settings.d/_1699_orchestration_settings.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heat_dashboard/content/template_generator/api.py b/heat_dashboard/content/template_generator/api.py index d40cb6db..ab2bb510 100644 --- a/heat_dashboard/content/template_generator/api.py +++ b/heat_dashboard/content/template_generator/api.py @@ -22,12 +22,12 @@ from heat_dashboard import api as heat_api try: - API_TIMEOUT = settings.API_TIMEOUT + API_TIMEOUT = settings.HEAT_TEMPLATE_GENERATOR_API_TIMEOUT except AttributeError: API_TIMEOUT = 60 try: - API_PARALLEL = settings.API_PARALLEL + API_PARALLEL = settings.HEAT_TEMPLATE_GENERATOR_API_PARALLEL except AttributeError: API_PARALLEL = 2 diff --git a/heat_dashboard/local_settings.d/_1699_orchestration_settings.py b/heat_dashboard/local_settings.d/_1699_orchestration_settings.py index 163b63a6..8d4b73f3 100644 --- a/heat_dashboard/local_settings.d/_1699_orchestration_settings.py +++ b/heat_dashboard/local_settings.d/_1699_orchestration_settings.py @@ -34,7 +34,7 @@ settings.POLICY_FILES.update({ # }) # Template Generator retrieve options API TIMEOUT -API_TIMEOUT = 60 +HEAT_TEMPLATE_GENERATOR_API_TIMEOUT = 60 # Template Generator retrieve options API PARALLEL LEVEL -API_PARALLEL = 2 +HEAT_TEMPLATE_GENERATOR_API_PARALLEL = 2