diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 13:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 13:39:07 +0000 |
| commit | d69ab19701a142fb654cdecb3d4fda09e098d7a8 (patch) | |
| tree | 26ae3e192aa88f123c65a2190810385c581643a7 /docker/ceilometer | |
| parent | d25ddf87f3f74c9889e303a9e139296fe70f04dc (diff) | |
| parent | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (diff) | |
| download | kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.tar.gz kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.zip | |
Merge "Remove Fedora support"
Diffstat (limited to 'docker/ceilometer')
6 files changed, 8 insertions, 8 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index b279a4c0b..dbe6c264e 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_api_packages = [ 'openstack-ceilometer-api', 'httpd', @@ -27,7 +27,7 @@ RUN echo > /etc/apache2/ports.conf {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_api_packages = [ 'httpd', diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 861ea018d..ca64609ee 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_base_packages = [ 'openstack-ceilometer-common', 'python-tooz', diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 1d54a9f3b..3d3d4e921 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_central_packages = ['openstack-ceilometer-central'] %} {% elif base_distro in ['ubuntu'] %} {% set ceilometer_central_packages = ['ceilometer-agent-central'] %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index 40c02155d..c2e67bbc5 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_collector_packages = ['openstack-ceilometer-collector'] %} {% elif base_distro in ['ubuntu'] %} {% set ceilometer_collector_packages = ['ceilometer-collector'] %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index bdb119be8..b60a53934 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_compute_packages = [ 'openstack-ceilometer-compute', 'python-ceilometerclient' @@ -21,7 +21,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} RUN yum -y install \ libvirt-devel \ diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index d2cdf5fe6..6d351391b 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %} {% elif base_distro in ['ubuntu'] %} {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %} |