aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2017-05-22 10:00:17 +0100
committerEduardo Gonzalez <dabarren@gmail.com>2017-05-22 10:00:17 +0100
commitcf328ff56245f589c57ab4e75303af978b411ebe (patch)
tree2de97f9ed42e53333d896715445b286bf0cec325 /docker
parent5e07d045a5207970a6b6b307ad76c44ac9de7591 (diff)
downloadkolla-cf328ff56245f589c57ab4e75303af978b411ebe.tar.gz
kolla-cf328ff56245f589c57ab4e75303af978b411ebe.zip
Fix aodh-base image
Aodh removed etc/aodh folder in [1] This folder only had oslo-config-generator file [2] Is safe to remove this file copy since it was already useless since we do not generate files from oslo. [1] https://review.openstack.org/#/c/459603/ [2] https://github.com/openstack/aodh/blob/stable/ocata/etc/aodh/aodh-config-generator.conf Change-Id: I2b92cafdcd41be4d778113072e0aedd6e93a8bc1
Diffstat (limited to 'docker')
-rw-r--r--docker/aodh/aodh-base/Dockerfile.j21
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index 32a81588a..74cc21e06 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -75,7 +75,6 @@ ADD aodh-base-archive /aodh-base-source
RUN ln -s aodh-base-source/* aodh \
&& {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/aodh /var/www/cgi-bin/aodh \
- && cp -r /aodh/etc/aodh/* /etc/aodh/ \
&& cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
&& chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh