vexxhost/openstack-operator
Code Issues Proposed changes

Fix horizon version

Browse Source 
Change-Id: I9671a8ffa76bb5119a52cb1abf2ad6547fffa038
This commit is contained in:
okozachenko 2020-06-23 20:27:27 +03:00
parent 528f64494d
commit cef0725c21
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
images/horizon/Dockerfile
View File

@ -15,18 +15,22 @@
FROM docker.io/opendevorg/python-builder as builder
COPY bindep.txt /tmp/src/bindep.txt
RUN assemble horizon==18.3.1 \
python-memcached \
heat-dashboard==2.0.0 \
designate-dashboard==9.0.0 \
neutron-vpnaas-dashboard==1.6.0 \
octavia-dashboard==4.0.0 \
sahara-dashboard==11.0.0 \
magnum-ui==6.0.0
RUN apt update && apt -y install git
ADD https://releases.openstack.org/constraints/upper/ussuri /tmp/src/upper-constraints.txt
RUN assemble git+https://opendev.org/openstack/horizon@stable/ussuri \
git+https://opendev.org/openstack/heat-dashboard@stable/ussuri \
git+https://opendev.org/openstack/designate-dashboard@stable/ussuri \
git+https://opendev.org/openstack/neutron-vpnaas-dashboard@stable/ussuri \
git+https://opendev.org/openstack/octavia-dashboard@stable/ussuri \
git+https://opendev.org/openstack/sahara-dashboard@stable/ussuri \
git+https://opendev.org/openstack/magnum-ui@stable/ussuri \
python-memcached
FROM docker.io/opendevorg/uwsgi-base
COPY --from=builder /output/ /output
RUN /output/install-from-bindep
RUN apt update && apt -y install git && \
/output/install-from-bindep && \
apt -y purge git && apt clean all
WORKDIR /usr/local/lib/python3.7/site-packages/openstack_dashboard
RUN ln -s /etc/horizon/local_settings.py local/local_settings.py && \
cp ../designatedashboard/enabled/*.py enabled/ && \

4
openstack_operator/templates/operator/uwsgidefaultconfig.yml.j2
View File

@ -11,12 +11,12 @@ data:
exit-on-reload = true
die-on-term = true
lazy-apps = true
add-header = 'Connection: close'
add-header = Connection: close
buffer-size = 65535
thunder-lock = true
http-auto-chunked = true
http-raw-body = true
socket-timeout = 10
need-app = true
route-user-agent = '^kube-probe.* donotlog:'
route-user-agent = ^kube-probe.* donotlog:
log-x-forwarded-for = true