diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 14:19:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 14:19:43 +0000 |
| commit | 35ea22ee99016328fbe9a68abe946e8087f425a6 (patch) | |
| tree | 79dd4d43295c8c502a90fae93fb46ea13dc939cf /docker/ceilometer | |
| parent | 326b29f363596e6b63ebdf2643d22b2b642aecea (diff) | |
| parent | 6992049323b271bf3856548f4a4d61482f5c4617 (diff) | |
| download | kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.tar.gz kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.zip | |
Merge "Add 'rhel' for RPM distros"
Diffstat (limited to 'docker/ceilometer')
6 files changed, 7 insertions, 6 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 index aa62562ac..b7fcc7fc2 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-alarm \ && yum clean all diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 805e5e8eb..9316ac5c5 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + RUN yum install -y openstack-ceilometer-api \ && yum clean all diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index b45c5fac3..0d7ee7147 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-central \ && yum clean all diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index 6f425e855..ec6ccbce9 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-collector \ && yum clean all diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 0487af710..60b18b973 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-compute \ python-ceilometerclient \ diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 67fcfb50e..bc6b30ffe 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-notification \ && yum clean all |