Remove rest_api_url from info payload

This was an original stab at solving the non-co-located problem that
wound up not being what we use.

Let's get rid of it.

Change-Id: I24d0d19ddacebb57e8db08e3ded6543286b7101a

doc/source/admin/components.rst

@@ -647,11 +647,6 @@ sections of ``zuul.conf`` are used by the web server:
 
       Port to use for web server process.
 
-   .. attr:: rest_api_url
-
-      Base URL on which the zuul-web REST service is exposed, if different
-      than the base URL where the web application is hosted.
-
    .. attr:: websocket_url
 
       Base URL on which the websocket service is exposed, if different

tests/unit/test_web.py

@@ -279,7 +279,6 @@ class TestInfo(BaseTestWeb):
         self.assertEqual(
             info, {
                 "info": {
-                    "rest_api_url": None,
                     "capabilities": {
                         "job_history": False
                     },
@@ -297,7 +296,6 @@ class TestInfo(BaseTestWeb):
         self.assertEqual(
             info, {
                 "info": {
-                    "rest_api_url": None,
                     "tenant": "tenant-one",
                     "capabilities": {
                         "job_history": False

zuul/model.py

@@ -3214,11 +3214,10 @@ class Capabilities(object):
 class WebInfo(object):
     """Information about the system needed by zuul-web /info."""
 
-    def __init__(self, websocket_url=None, rest_api_url=None,
+    def __init__(self, websocket_url=None,
                  capabilities=None, stats_url=None,
                  stats_prefix=None, stats_type=None):
         self.capabilities = capabilities or Capabilities()
-        self.rest_api_url = rest_api_url
         self.stats_prefix = stats_prefix
         self.stats_type = stats_type
         self.stats_url = stats_url
@@ -3232,7 +3231,6 @@ class WebInfo(object):
     def copy(self):
         return WebInfo(
             capabilities=self.capabilities.copy(),
-            rest_api_url=self.rest_api_url,
             stats_prefix=self.stats_prefix,
             stats_type=self.stats_type,
             stats_url=self.stats_url,
@@ -3241,7 +3239,6 @@ class WebInfo(object):
     @staticmethod
     def fromConfig(config):
         return WebInfo(
-            rest_api_url=get_default(config, 'web', 'rest_api_url', None),
             stats_prefix=get_default(config, 'statsd', 'prefix'),
             stats_type=get_default(config, 'web', 'stats_type', 'graphite'),
             stats_url=get_default(config, 'web', 'stats_url', None),
@@ -3251,7 +3248,6 @@ class WebInfo(object):
     def toDict(self):
         d = dict()
         d['capabilities'] = self.capabilities.toDict()
-        d['rest_api_url'] = self.rest_api_url
         d['websocket_url'] = self.websocket_url
         stats = dict()
         stats['prefix'] = self.stats_prefix