diff --git a/awx/api/metadata.py b/awx/api/metadata.py index 43510bec75..ea07990081 100644 --- a/awx/api/metadata.py +++ b/awx/api/metadata.py @@ -68,7 +68,7 @@ class Metadata(metadata.SimpleMetadata): # FIXME: Still isn't showing all default values? try: default = field.get_default() - if not default and field.field_name == 'TOWER_URL_BASE': + if field.field_name == 'TOWER_URL_BASE' and default == 'https://towerhost': default = '{}://{}'.format(self.request.scheme, self.request.get_host()) field_info['default'] = default except serializers.SkipField: diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index f0e03c68e1..9890f7a468 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -861,7 +861,7 @@ ORG_ADMINS_CAN_SEE_ALL_USERS = True TOWER_ADMIN_ALERTS = True # Note: This setting may be overridden by database settings. -TOWER_URL_BASE = "" +TOWER_URL_BASE = "https://towerhost" TOWER_SETTINGS_MANIFEST = {}