openstack
/
kolla
Code Issues Proposed changes

Merge "gnocchi rpm naming cleanup"

This commit is contained in:
Zuul 2019-02-25 10:57:51 +00:00 committed by Gerrit Code Review
parent 1a549abf4d 1d208580b1
commit 9d9e402fc8
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -8,8 +8,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_api_packages = [
'openstack-gnocchi-api',
'openstack-gnocchi-indexer-sqlalchemy'
'gnocchi-api',
'gnocchi-common'
] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_api_packages = ['gnocchi-api'] %}

2
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -11,10 +11,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [
'gnocchi-common',
'httpd',
'mod_ssl',
'mod_wsgi',
'openstack-gnocchi-common',
'python2-ldappool',
'python2-cradox'
] %}

8
docker/gnocchi/gnocchi-metricd/Dockerfile.j2
View File

@ -6,14 +6,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{% endif %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}
{% endif %}
{% block gnocchi_metricd_footer %}{% endblock %}
{% block footer %}{% endblock %}

8
docker/gnocchi/gnocchi-statsd/Dockerfile.j2
View File

@ -6,14 +6,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %}
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}
{% endif %}
{% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}
{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
{% endif %}
{% block gnocchi_statsd_footer %}{% endblock %}
{% block footer %}{% endblock %}