Merge "gnocchi rpm naming cleanup"

4 files changed, 7 insertions, 15 deletions

diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2
index 4ffc869a9..863018336 100644
--- a/docker/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2
@@ -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'] %}
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 0724cb38c..aa15bc289 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -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'
         ] %}
diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
index cd517f9a9..5fda3852e 100644
--- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
@@ -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 %}
 
diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
index dd1d940b2..434d37d4c 100644
--- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
@@ -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 %}