From a8cc61efcfd583d7aaae0fc69f5a69ab7b29107e Mon Sep 17 00:00:00 2001 From: Mark Duggan Date: Mon, 13 Jul 2015 11:05:55 +0000 Subject: Fixes login failure to Horizon dashboard This is a temporary workaround to fix a Django error preventing the Kolla Horizon login, while waiting for a fix upstream. It is part of a patch created by Matthias Runge https://review.openstack.org/gitweb?p=openstack%2Fdjango_openstack_auth.git;a=commitdiff;h=adfc494ec17ee43847d7c0c833dad9c178f29358 I've just used the patch for openstack_auth/user.py Change-Id: I2c2ad0042f9c60a839d8ee9bca904465bee9361f Closes-bug: #1469284 --- docker/centos/binary/horizon/Dockerfile | 7 ++++++- docker/centos/binary/horizon/horizon-bug-1469284.patch | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) create mode 120000 docker/centos/binary/horizon/horizon-bug-1469284.patch (limited to 'docker/centos') diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile index 79f9b8bd6..fff2bff43 100644 --- a/docker/centos/binary/horizon/Dockerfile +++ b/docker/centos/binary/horizon/Dockerfile @@ -5,13 +5,18 @@ RUN yum -y install \ openstack-dashboard \ httpd \ httpd-mod-wsgi \ + patch \ && yum clean all \ && chown -R apache:apache /usr/share/openstack-dashboard/static # The chown is required because of this packaging bug: # https://bugzilla.redhat.com/show_bug.cgi?id=1219006 +COPY config-internal.sh config-external.sh horizon-bug-1469284.patch /opt/kolla/ +# TODO(mduggan): Need to remove this patch once a fix for +# https://bugs.launchpad.net/kolla/+bug/1469284 becomes available upstream. +# Review for this bug is at https://review.openstack.org/#/c/167981/ +RUN patch /usr/lib/python2.7/site-packages/openstack_auth/user.py < /opt/kolla/horizon-bug-1469284.patch ADD ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/horizon/horizon-bug-1469284.patch b/docker/centos/binary/horizon/horizon-bug-1469284.patch new file mode 120000 index 000000000..32a745509 --- /dev/null +++ b/docker/centos/binary/horizon/horizon-bug-1469284.patch @@ -0,0 +1 @@ +../../../common/horizon/horizon-bug-1469284.patch \ No newline at end of file -- cgit v1.2.3