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/aodh | |
| parent | d25ddf87f3f74c9889e303a9e139296fe70f04dc (diff) | |
| parent | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (diff) | |
| download | kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.tar.gz kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.zip | |
Merge "Remove Fedora support"
Diffstat (limited to 'docker/aodh')
| -rw-r--r-- | docker/aodh/aodh-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-expirer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-listener/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-notifier/Dockerfile.j2 | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 23288c9b0..370b77286 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-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 aodh_api_packages = ['openstack-aodh-api'] %} {% elif base_distro in ['ubuntu'] %} {% set aodh_api_packages = ['aodh-api'] %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index ad9cd4375..02949b5d9 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set aodh_base_packages = [ 'openstack-aodh-common', @@ -36,7 +36,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set aodh_base_packages = [ 'httpd', diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 342d4b1c9..4fa319ce8 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/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 aodh_evaluator_packages = ['openstack-aodh-evaluator'] %} {% elif base_distro in ['ubuntu'] %} {% set aodh_evaluator_packages = ['aodh-evaluator'] %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 235c7d369..c43af18c7 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/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 aodh_expirer_packages = ['openstack-aodh-expirer'] %} {% elif base_distro in ['ubuntu'] %} {% set aodh_expirer_packages = ['aodh-expirer'] %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 894d44f67..45b41a3ad 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/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 aodh_listener_packages = ['openstack-aodh-listener'] %} {% elif base_distro in ['ubuntu'] %} {% set aodh_listener_packages = ['aodh-listener'] %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index c83de2af5..7e1fbadc1 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/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 aodh_notifier_packages = ['openstack-aodh-notifier'] %} {% elif base_distro in ['ubuntu'] %} {% set aodh_notifier_packages = ['aodh-notifier'] %} |