diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-15 03:24:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-15 03:24:34 +0000 |
| commit | 4a41193bbe8a785168e6274409023187a7015f55 (patch) | |
| tree | cad41bab4778926ccfee8ebe265c2b00f9dc0877 /docker/centos/binary | |
| parent | c7ed1f8178c7d5a7feadc377ee9ac4455d9476f7 (diff) | |
| parent | a8cc61efcfd583d7aaae0fc69f5a69ab7b29107e (diff) | |
| download | kolla-4a41193bbe8a785168e6274409023187a7015f55.tar.gz kolla-4a41193bbe8a785168e6274409023187a7015f55.zip | |
Merge "Fixes login failure to Horizon dashboard"
Diffstat (limited to 'docker/centos/binary')
| -rw-r--r-- | docker/centos/binary/horizon/Dockerfile | 7 | ||||
| l--------- | docker/centos/binary/horizon/horizon-bug-1469284.patch | 1 |
2 files changed, 7 insertions, 1 deletions
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 |