From 24f1714a164fb15b1764566d0bb531536ae024d5 Mon Sep 17 00:00:00 2001
From: Farid Da Encarnacao <farid.daencarnacao@gmail.com>
Date: Thu, 21 Sep 2017 11:27:13 -0400
Subject: [PATCH] Fix Gnocchi support ceph

Based on gnocchi issue #412 [0], cradox is more stable and recommended
to use.

* Add cradox for source and  RHEL family distro binary.
* Ubuntu binary lacks of cradox package, so install from pypi

[0] https://github.com/gnocchixyz/gnocchi/issues/412

Co-Authored-By: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Change-Id: Icf7d6425884fb889d48c786caebbfc7b7050ae8e
Closes-Bug: #1718701
---
 docker/gnocchi/gnocchi-base/Dockerfile.j2 | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index c96e367042..563828e810 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'mod_wsgi',
             'openstack-gnocchi-common',
             'python-ldappool',
-            'python-rados'
+            'python2-cradox'
         ] %}
 
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
@@ -26,14 +26,22 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
 
        {% set gnocchi_base_packages = [
             'apache2',
+            'build-essential',
             'gnocchi-common',
             'libapache2-mod-wsgi',
+            'librados-dev',
+            'python-dev',
             'python-ldappool',
-            'python-rados'
+            'python-rados',
+            'python-setuptools'
+        ] %}
+        {% set gnocchi_base_pip_packages = [
+            'cradox'
         ] %}
 
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
-RUN truncate -s 0 /etc/apache2/ports.conf
+RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false) }} \
+    && truncate -s 0 /etc/apache2/ports.conf
 
     {% endif %}
 {% elif install_type == 'source' %}
@@ -41,10 +49,10 @@ RUN truncate -s 0 /etc/apache2/ports.conf
 
        {% set gnocchi_base_packages = [
             'httpd',
+            'librados2-devel',
             'mod_ssl',
             'mod_wsgi',
-            'python-ldappool',
-            'python-rados'
+            'python-ldappool'
         ] %}
 
         # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
@@ -66,8 +74,8 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \
        {% set gnocchi_base_packages = [
             'apache2',
             'libapache2-mod-wsgi',
-            'python-ldappool',
-            'python-rados'
+            'librados-dev',
+            'python-ldappool'
         ] %}
 
         # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le