Merge pull request #5531 from ryanpetrello/fix-5470

retain the default interstitial value for TOWER_URL_BASE

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:

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 = {}