diff --git a/.zuul.yaml b/.zuul.yaml index ce3f103..cbb10e9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -16,7 +16,7 @@ devstack_plugins: skyline-apiserver: https://opendev.org/openstack/skyline-apiserver zuul_copy_output: - /var/log/kolla/skyline: logs + /var/log/skyline: logs /etc/skyline: logs /etc/nginx: logs host-vars: diff --git a/container/Dockerfile b/container/Dockerfile index 9908f0f..8169e76 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -28,7 +28,7 @@ RUN export LANG=C.UTF-8 \ && pip install -U pip setuptools'<58.0.0' \ && pip install poetry!=1.1.8 \ && poetry config virtualenvs.create false \ - && mkdir -p /etc/skyline /var/log/kolla/skyline /var/lib/skyline \ + && mkdir -p /etc/skyline /var/log/skyline /var/lib/skyline \ && cd /skyline \ && poetry install \ && pip install ${SKYLINE_CONSOLE_PACKAGE_URL} \ diff --git a/devstack/settings b/devstack/settings index 954e26f..c8005e0 100644 --- a/devstack/settings +++ b/devstack/settings @@ -18,7 +18,7 @@ GITDIR["skyline-console"]=$DEST/skyline-console # Set up default directories SKYLINE_CONF_DIR=${SKYLINE_CONF_DIR:-/etc/skyline} SKYLINE_CONF_FILE=${SKYLINE_CONF_DIR}/skyline.yaml -SKYLINE_LOG_DIR=/var/log/kolla/skyline +SKYLINE_LOG_DIR=/var/log/skyline SKYLINE_ERROR_LOG_FILE=${SKYLINE_LOG_DIR}/error.log SKYLINE_ACCESS_LOG_FILE=${SKYLINE_LOG_DIR}/access.log SKYLINE_RUN_DIR=/var/lib/skyline diff --git a/etc/gunicorn.py b/etc/gunicorn.py index 854a876..9e3b1cb 100644 --- a/etc/gunicorn.py +++ b/etc/gunicorn.py @@ -8,5 +8,5 @@ keepalive = 5 reuse_port = True proc_name = "skyline" log_level = "debug" -accesslog = "/var/log/kolla/skyline/access.log" -errorlog = "/var/log/kolla/skyline/error.log" +accesslog = "/var/log/skyline/access.log" +errorlog = "/var/log/skyline/error.log" diff --git a/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 b/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 index e647fdf..40bb97d 100644 --- a/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 +++ b/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 @@ -44,8 +44,8 @@ http { '"$upstream_response_time" "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log {{ log_dir | default('/var/log/kolla/') }}skyline/nginx_access.log main; - error_log {{ log_dir | default('/var/log/kolla/') }}skyline/nginx_error.log; + access_log {{ log_dir | default('/var/log') }}/skyline/nginx_access.log main; + error_log {{ log_dir | default('/var/log') }}/skyline/nginx_error.log; ## # Gzip Settings