diff --git a/nailgun/nailgun/settings.yaml b/nailgun/nailgun/settings.yaml index b4396f1cc6..30a8b0f0ee 100644 --- a/nailgun/nailgun/settings.yaml +++ b/nailgun/nailgun/settings.yaml @@ -78,6 +78,7 @@ RPC_CONSUMER_LOG_PATH: "/var/log/nailgun/receiverd.log" ASSASSIN_LOG_PATH: "/var/log/nailgun/assassind.log" +COLLECTOR_SERVER: "collector.fuel-infra.org" COLLECTOR_ACTION_LOGS_URL: "https://{collector_server}/api/v1/action_logs/" COLLECTOR_INST_INFO_URL: "https://{collector_server}/api/v1/installation_structure/" COLLECTOR_OSWL_INFO_URL: "https://{collector_server}/api/v1/oswl_stats/" diff --git a/nailgun/nailgun/statistics/statsenderd.py b/nailgun/nailgun/statistics/statsenderd.py index f459948fcf..063b09f4b6 100644 --- a/nailgun/nailgun/statistics/statsenderd.py +++ b/nailgun/nailgun/statistics/statsenderd.py @@ -38,11 +38,9 @@ logger = logging.getLogger('statistics') class StatsSender(object): - COLLECTOR_COMMUNITY_SERVER = "collector.fuel-infra.org" - def build_collector_url(self, url_template): return getattr(settings, url_template)\ - .format(collector_server=self.COLLECTOR_COMMUNITY_SERVER) + .format(collector_server=settings.COLLECTOR_SERVER) def ping_collector(self): try: diff --git a/nailgun/nailgun/test/unit/fuel_statistics_tests/test_statsender.py b/nailgun/nailgun/test/unit/fuel_statistics_tests/test_statsender.py index 71b32a7767..b2ff37d5f8 100644 --- a/nailgun/nailgun/test/unit/fuel_statistics_tests/test_statsender.py +++ b/nailgun/nailgun/test/unit/fuel_statistics_tests/test_statsender.py @@ -53,7 +53,7 @@ class TestStatisticsSender(BaseTestCase): @patch.dict('nailgun.settings.settings.VERSION', FEATURE_EXPERIMENTAL) def test_community_collector_urls(self): - self.check_collector_urls(StatsSender.COLLECTOR_COMMUNITY_SERVER) + self.check_collector_urls(settings.COLLECTOR_SERVER) @patch('nailgun.statistics.statsenderd.requests.get') def test_ping_ok(self, requests_get):