openstack
/
tripleo-common
Code Issues Proposed changes

Fix localization for horizon container 

There's a macro that removes localization data from containers in
order to save space. In order to install localized web apps it
has to be moved the app installed and then moved back

also the packages were being installed twice I also fixed that

It was being done only for openstack-dashboard before now I changed to do
that for all UI web apps.

Closes-Bug: 1905250

/1905250

Change-Id: I66cb4fa785a28cc0a30711ffe834e210c11c7f89
(cherry picked from commit 956c0a2ee6)
(cherry picked from commit 0701428ee9)
This commit is contained in:
apetrich 2020-11-23 09:48:21 +01:00 committed by Keigo Noha
parent ab466b8d57
commit 2b628273cb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
container-images/tcib/base/os/horizon/horizon.yaml
View File

@ -1,6 +1,5 @@
tcib_actions:
- run: mv /etc/rpm/macros.image-language-conf /tmp && dnf -y install openstack-dashboard && mv /tmp/macros.image-language-conf /etc/rpm && dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: mv /etc/rpm/macros.image-language-conf /tmp && dnf -y install {{ tcib_packages.with_localization | join(' ') }} && mv /tmp/macros.image-language-conf /etc/rpm && dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- copy: /usr/share/tripleo-common/container-images/kolla/horizon/extend_start.sh /usr/local/bin/kolla_extend_start
- run: chmod 755 /usr/local/bin/kolla_extend_start
- run: 'sed -i -r ''s,^(Listen 80),#\1,'' /etc/httpd/conf/httpd.conf && sed -i -r ''s,^(Listen 443),#\1,'' /etc/httpd/conf.d/ssl.conf && ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python3.6/site-packages/openstack_dashboard && ln -s /usr/share/openstack-dashboard/static /usr/lib/python3.6/site-packages/static && chown -R apache /etc/openstack-dashboard /usr/share/openstack-dashboard && chown -R apache /usr/share/openstack-dashboard/static && sed -i "s|WEBROOT = ''/dashboard/''|WEBROOT = ''/''|" /etc/openstack-dashboard/local_settings && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* && rm -f /usr/lib/python3.6/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* && for locale in /usr/lib/python3.6/site-packages/*/locale; do (cd ${locale%/*} && /usr/bin/django-admin compilemessages) done'
@ -11,8 +10,10 @@ tcib_packages:
- gettext
- httpd
- mod_ssl
- python3-mod_wsgi
with_localization:
- openstack-dashboard
- openstack-heat-ui
- openstack-ironic-ui
- openstack-manila-ui
- openstack-octavia-ui
- python3-mod_wsgi