From c7c899375b03d90db12cf4fec1b9a0571a89b27f Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 30 Jan 2020 16:14:36 -0500 Subject: [PATCH] when a license is installed, only set TOWER_URL_BASE if necessary it's possible for users to set this manually in /etc/tower/conf.d prior to license application --- awx/api/views/root.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/api/views/root.py b/awx/api/views/root.py index e4e0657652..f4d68ace9c 100644 --- a/awx/api/views/root.py +++ b/awx/api/views/root.py @@ -20,6 +20,7 @@ from rest_framework import status import requests from awx.api.generics import APIView +from awx.conf.registry import settings_registry from awx.main.ha import is_ha_environment from awx.main.utils import ( get_awx_version, @@ -302,7 +303,8 @@ class ApiV2ConfigView(APIView): # If the license is valid, write it to the database. if license_data_validated['valid_key']: settings.LICENSE = license_data - settings.TOWER_URL_BASE = "{}://{}".format(request.scheme, request.get_host()) + if not settings_registry.is_setting_read_only('TOWER_URL_BASE'): + settings.TOWER_URL_BASE = "{}://{}".format(request.scheme, request.get_host()) return Response(license_data_validated) logger.warning(smart_text(u"Invalid license submitted."),