diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-08 10:27:56 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-08 10:45:21 -0700 |
| commit | 608527debc78f46e2d679f68199034313c5bb4bd (patch) | |
| tree | 2df0a3320f0ed414b0289fd5f9f1b4600850b54a /docker/centos | |
| parent | 0b63b64d051df5241ea8a6de733fb418ef66498a (diff) | |
| download | kolla-608527debc78f46e2d679f68199034313c5bb4bd.tar.gz kolla-608527debc78f46e2d679f68199034313c5bb4bd.zip | |
Revert a8cc61ef so horizon will build
Revert a8cc61efcfd583d7aaae0fc69f5a69ab7b29107e as Horizon has
landed the bugfix upstraem and its now available in RDO. From source
is not pulling master, so this isn't an issue there.
Change-Id: I4acd76698102e2203ce3b70d9988ad3cb2c1c8c5
Closes-Bug: #1482894
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/binary/horizon/Dockerfile | 7 | ||||
| l--------- | docker/centos/binary/horizon/horizon-bug-1469284.patch | 1 | ||||
| l--------- | docker/centos/source/horizon/horizon-bug-1469284.patch | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile index d8b8bf8cf..60e625597 100644 --- a/docker/centos/binary/horizon/Dockerfile +++ b/docker/centos/binary/horizon/Dockerfile @@ -5,18 +5,13 @@ RUN yum -y install \ openstack-dashboard \ 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 +COPY config-internal.sh config-external.sh /opt/kolla/ COPY ./start.sh /start.sh CMD ["/start.sh"] diff --git a/docker/centos/binary/horizon/horizon-bug-1469284.patch b/docker/centos/binary/horizon/horizon-bug-1469284.patch deleted file mode 120000 index 32a745509..000000000 --- a/docker/centos/binary/horizon/horizon-bug-1469284.patch +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/horizon-bug-1469284.patch
\ No newline at end of file diff --git a/docker/centos/source/horizon/horizon-bug-1469284.patch b/docker/centos/source/horizon/horizon-bug-1469284.patch deleted file mode 120000 index 32a745509..000000000 --- a/docker/centos/source/horizon/horizon-bug-1469284.patch +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/horizon-bug-1469284.patch
\ No newline at end of file |