diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 05:36:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 05:36:24 +0000 |
| commit | af0ba32a6a7ed580ab9a9d010b6e5ea8ae3bb77c (patch) | |
| tree | 3d251eefefe4fe48fc0e442bf663d6935221a934 | |
| parent | dc063ce776ee26234de4af8b2ecefab748245541 (diff) | |
| parent | e7e06c5735593bbf3ce96544461264bfa0f5f078 (diff) | |
| download | kolla-af0ba32a6a7ed580ab9a9d010b6e5ea8ae3bb77c.tar.gz kolla-af0ba32a6a7ed580ab9a9d010b6e5ea8ae3bb77c.zip | |
Merge "Fix aodh dockerfile"
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index d7db73023..fb74d296f 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -12,7 +12,6 @@ MAINTAINER {{ maintainer }} {% set aodh_base_packages = [ 'openstack-aodh-common', - 'python-aodhclient', 'httpd', 'mod_wsgi', 'python-ldappool' @@ -66,10 +65,10 @@ ADD aodh-base-archive /aodh-base-source RUN ln -s aodh-base-source/* aodh \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pymongo /aodh \ - && mkdir -p /etc/aodh /var/log/kolla/aodh /var/www/cgi-bin/aodh \ + && 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/log/kolla/aodh /var/www/cgi-bin/aodh + && chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh {% endif %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index bb9fcb77c..9dea12588 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -74,6 +74,7 @@ MAINTAINER {{ maintainer }} 'python-alembic', 'python-amqp', 'python-anyjson', + 'python-aodhclient', 'python-barbicanclient', 'python-beaker', 'python-cachetools', @@ -163,6 +164,7 @@ MAINTAINER {{ maintainer }} # This will prevent questions from being asked during the install ENV DEBIAN_FRONTEND noninteractive {% set openstack_base_packages = [ + 'python-aodhclient', 'python-barbicanclient', 'python-ceilometerclient', 'python-congressclient', @@ -249,6 +251,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ 'alembic', 'amqp', 'anyjson', + 'aodhclient', 'appdirs', 'cachetools', 'cliff', |