diff --git a/contrib/fuel_mirror/etc/config.yaml b/contrib/fuel_mirror/etc/config.yaml index 3a92bd2..e6e9576 100644 --- a/contrib/fuel_mirror/etc/config.yaml +++ b/contrib/fuel_mirror/etc/config.yaml @@ -3,9 +3,9 @@ ignore_errors_num: 2 retries_num: 3 target_dir: "/var/www/nailgun/mirrors" pattern_dir: "/usr/share/fuel-mirror" +base_url: "http://{FUEL_SERVER_IP}:8080/mirrors/" # uncomment if need # http_proxy: null # https_proxy: null # fuel_server: 10.20.0.2 -# base_url: http://10.20.0.2:8080 diff --git a/contrib/fuel_mirror/fuel_mirror/app.py b/contrib/fuel_mirror/fuel_mirror/app.py index 17a1ce2..edf91a3 100644 --- a/contrib/fuel_mirror/fuel_mirror/app.py +++ b/contrib/fuel_mirror/fuel_mirror/app.py @@ -24,9 +24,6 @@ from fuel_mirror.common import accessors from fuel_mirror.common import utils -_FUEL_DEFAULT_HTTP_PORT = 8080 - - class Application(app.App): """Main cliff application class. @@ -89,11 +86,8 @@ class Application(app.App): self.options.fuel_password, fuel_default["password"] ) - self.config.setdefault( - "base_url", "http://{0}:{1}".format( - fuel_server.split(":", 1)[0], - _FUEL_DEFAULT_HTTP_PORT - ) + self.config["base_url"] = self.config["base_url"].format( + FUEL_SERVER_IP=fuel_server.split(":", 1)[0] ) self.fuel = accessors.get_fuel_api_accessor( fuel_server, diff --git a/contrib/fuel_mirror/fuel_mirror/tests/data/test_config.yaml b/contrib/fuel_mirror/fuel_mirror/tests/data/test_config.yaml index 94be04d..3ba5cd1 100644 --- a/contrib/fuel_mirror/fuel_mirror/tests/data/test_config.yaml +++ b/contrib/fuel_mirror/fuel_mirror/tests/data/test_config.yaml @@ -3,4 +3,5 @@ ignore_errors_num: 2 retries_num: 3 http_proxy: "http://localhost" https_proxy: "https://localhost" -target_dir: "/var/www/" \ No newline at end of file +target_dir: "/var/www/" +base_url: "http://{FUEL_SERVER_IP}:8080/"