diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-06 10:14:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-06 10:14:03 +0000 |
| commit | 3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (patch) | |
| tree | d923b0b6e4e8fbf1b97a4fdcf6c4b4b336c1d878 /docker/gnocchi | |
| parent | a130ecb153f555ffd96bebf554eaa10c34a1486d (diff) | |
| parent | 69fef5cd59286b5eeaa4deaf9da97511413ed653 (diff) | |
| download | kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.tar.gz kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.zip | |
Merge "debian: enable all images enabled for Ubuntu"
Diffstat (limited to 'docker/gnocchi')
| -rw-r--r-- | docker/gnocchi/gnocchi-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-metricd/Dockerfile.j2 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index a0a49d632..553689285 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }} 'openstack-gnocchi-api', 'openstack-gnocchi-indexer-sqlalchemy' ] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set gnocchi_api_packages = ['gnocchi-api'] %} {% endif %} {{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 17b6afc38..5fa6ceafc 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set gnocchi_base_packages = [ 'apache2', @@ -50,7 +50,7 @@ RUN truncate -s 0 /etc/apache2/ports.conf RUN mkdir -p /var/www/cgi-bin/gnocchi \ && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set gnocchi_base_packages = [ 'apache2', diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 365edf370..7d4a38472 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set gnocchi_metricd_packages = ['gnocchi-metricd'] %} {% endif %} {{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }} |
