diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-07 09:06:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-07 09:06:44 +0000 |
| commit | 77a31346d0b5a2baa8ef30cc9fbcb1b8c13d7044 (patch) | |
| tree | 124c010f4079751ed8a32813f61868fdca110e28 /docker | |
| parent | b58147bcc0a98f694075b9593bffced1ab63bec0 (diff) | |
| parent | 96318fed5aafff3d2a9315838cb7e7c0e76eb8f8 (diff) | |
| download | kolla-77a31346d0b5a2baa8ef30cc9fbcb1b8c13d7044.tar.gz kolla-77a31346d0b5a2baa8ef30cc9fbcb1b8c13d7044.zip | |
Merge "Integrate gnocchi with ceph"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 213a3a610..1986ca703 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -13,7 +13,8 @@ MAINTAINER {{ maintainer }} 'python-gnocchiclient', 'httpd', 'mod_wsgi', - 'python-ldappool' + 'python-ldappool', + 'python-rados' ] %} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} @@ -24,7 +25,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf 'gnocchi-common', 'apache2', 'libapache2-mod-wsgi', - 'python-ldappool' + 'python-ldappool', + 'python-rados' ] %} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} @@ -37,7 +39,8 @@ RUN truncate -s 0 /etc/apache2/ports.conf {% set gnocchi_base_packages = [ 'httpd', 'mod_wsgi', - 'python-ldappool' + 'python-ldappool', + 'python-rados' ] %} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/gnocchi \ @@ -47,7 +50,8 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \ {% set gnocchi_base_packages = [ 'apache2', 'libapache2-mod-wsgi', - 'python-ldappool' + 'python-ldappool', + 'python-rados' ] %} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} @@ -58,7 +62,7 @@ ADD gnocchi-base-archive /gnocchi-base-source RUN ln -s gnocchi-base-source/* gnocchi \ && useradd --user-group gnocchi \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt gnocchiclient /gnocchi[keystone,mysql,file] \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt gnocchiclient /gnocchi[keystone,mysql,file,ceph] \ && mkdir -p /etc/gnocchi /var/log/kolla/gnocchi /home/gnocchi \ && cp -r /gnocchi/etc/gnocchi/* /etc/gnocchi/ \ && chown -R gnocchi: /etc/gnocchi /var/log/kolla/gnocchi |