diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 07:48:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 07:48:23 +0000 |
| commit | c7ea6aa13e455eebc02f93b6b1351d3b293b9744 (patch) | |
| tree | 3524ccf75192c4e1c448a61629ab6ff89b041804 | |
| parent | 0a3fa59241220608e2c588e4d9bb488a1b291f1a (diff) | |
| parent | 970075d49a827770963e6c98a3978fe1a73d1f6b (diff) | |
| download | kolla-c7ea6aa13e455eebc02f93b6b1351d3b293b9744.tar.gz kolla-c7ea6aa13e455eebc02f93b6b1351d3b293b9744.zip | |
Merge "Update Ceilometer dockerfiles for formatting"
5 files changed, 9 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 921e57ee8..668226109 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/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-ceilometer-api \ +RUN yum -y install \ + openstack-ceilometer-api \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index a34f80163..44dae4004 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/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-ceilometer-central \ +RUN yum -y install \ + openstack-ceilometer-central \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index 485119a20..5bf0e9a2d 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/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-ceilometer-collector \ +RUN yum -y install \ + openstack-ceilometer-collector \ && yum clean all {% elif base_distro in ['ubuntu'] %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 5837e9211..90933e06e 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/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-ceilometer-compute \ python-ceilometerclient \ && yum clean all diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index cc699e043..7546f0f5a 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/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-ceilometer-notification \ +RUN yum -y install \ + openstack-ceilometer-notification \ && yum clean all {% elif base_distro in ['ubuntu'] %} |