openstack/kolla
Code Issues Proposed changes

gnocchi rpm naming cleanup

Browse Source 
During the Queens cycle the gnocci project was
moved out of openstack and so naming changed from
openstack-gnocchi-XXX to gnocchi-XXX

January 2018 - https://review.rdoproject.org/r/#/c/11110/

Also openstack-gnocchi-indexer-sqlalchemy was moved to gnocchi-common

2017 - https://review.rdoproject.org/r/#/c/10449/

Change-Id: I511c248bd009d03cad6811c576dd91a7bb29e203
This commit is contained in:
Jon Schlueter 2019-02-06 09:50:33 -05:00 committed by Martin André
parent 5922c22d8a
commit 1d208580b1
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 install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set gnocchi_api_packages = [ {% set gnocchi_api_packages = [
'openstack-gnocchi-api', 'gnocchi-api',
'openstack-gnocchi-indexer-sqlalchemy' 'gnocchi-common'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set gnocchi_api_packages = ['gnocchi-api'] %} {% 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' %} {% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'gnocchi-common',
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-gnocchi-common',
'python2-ldappool', 'python2-ldappool',
'python2-cradox' '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 %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{% endif %}
{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block gnocchi_metricd_footer %}{% endblock %} {% block gnocchi_metricd_footer %}{% endblock %}
{% block 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 %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}
{% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %}
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}
{% endif %}
{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block gnocchi_statsd_footer %}{% endblock %} {% block gnocchi_statsd_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}