Browse Source

[DO NOT MERGE] Add vendor theme

Change-Id: I8438519bd62fabfcc76d35088f0156e2345dfef1
changes/89/352589/8
Andrey 3 years ago
parent
commit
9f5b445f79
3 changed files with 9 additions and 3 deletions
  1. 3
    2
      docker/horizon/Dockerfile.j2
  2. 5
    0
      service/files/defaults.yaml
  3. 1
    1
      service/files/local_settings.j2

+ 3
- 2
docker/horizon/Dockerfile.j2 View File

@@ -9,8 +9,7 @@ RUN apt-get update \

{{ copy_sources("openstack/horizon", "/horizon") }}
{{ copy_sources("openstack/sahara-dashboard", "/sahara-dashboard") }}
{{ copy_sources("openstack/murano-dashboard", "/murano-dashboard") }}
{{ copy_sources("openstack/searchlight-ui", "/searchlight-ui") }}
{{ copy_sources("mirantis-theme", "/theme") }}

RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \
&& cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \
@@ -27,6 +26,8 @@ RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \
cp -a /searchlight-ui/searchlight_ui/conf/searchlight_policy.json /horizon/openstack_dashboard/conf/; fi) \
&& (if [ -f /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py ]; then \
cp -a /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py /horizon/openstack_dashboard/local/local_settings.d/; fi) \
&& cp /theme/local/local_settings.d/_10_set_custom_theme.py /horizon/openstack_dashboard/local/local_settings.d/ \
&& cp -r /theme/themes/vendor/ /horizon/openstack_dashboard/themes/ \
&& /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard /murano-dashboard /searchlight-ui \
&& useradd --user-group horizon \
&& ln -s /etc/openstack-dashboard/local_settings /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \

+ 5
- 0
service/files/defaults.yaml View File

@@ -10,6 +10,8 @@ configs:
processes: 6
threads: 15

theme: mirantis

sources:
openstack/horizon:
git_url: https://git.openstack.org/openstack/horizon.git
@@ -23,3 +25,6 @@ sources:
openstack/searchlight-ui:
git_url: https://git.openstack.org/openstack/searchlight-ui.git
git_ref: stable/newton
mirantis-theme:
git_url: https://review.fuel-infra.org/openstack/horizon-vendor-theme
git_ref: 9.0/mitaka

+ 1
- 1
service/files/local_settings.j2 View File

@@ -437,7 +437,7 @@ TIME_ZONE = "UTC"
# ('default', 'Default', 'themes/default'),
# ('material', 'Material', 'themes/material'),
#]
DEFAULT_THEME = "{{ horizon.theme }}"
LOGGING = {
'version': 1,
# When set to True this will disable all logging except

Loading…
Cancel
Save