diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 07:48:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 07:48:16 +0000 |
| commit | 0a3fa59241220608e2c588e4d9bb488a1b291f1a (patch) | |
| tree | 95f3c9714cfad85dcc50016633510bc609d53bae | |
| parent | 725505c906fb68731ebbcad7b1684c5846e08e24 (diff) | |
| parent | 9fe4d3585c1bc97e7ff28b7c11d0045fecd9b82c (diff) | |
| download | kolla-0a3fa59241220608e2c588e4d9bb488a1b291f1a.tar.gz kolla-0a3fa59241220608e2c588e4d9bb488a1b291f1a.zip | |
Merge "Update Gnocchi dockerfiles for formatting"
| -rw-r--r-- | docker/gnocchi/gnocchi-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-statsd/Dockerfile.j2 | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 679b5a914..2d66e5e4d 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum install -y \ +RUN yum -y install \ openstack-gnocchi-api \ openstack-gnocchi-carbonara \ openstack-gnocchi-indexer-sqlalchemy \ diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 67800ef91..9e8dfff76 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum install -y \ +RUN yum -y install \ openstack-gnocchi-common \ && yum clean all diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index fa123966f..900cab8e8 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum install -y openstack-gnocchi-statsd \ +RUN yum -y install \ + openstack-gnocchi-statsd \ && yum clean all {% endif %} |