Merge "Add cloudkitty centos/oracle binary packages"

5 files changed, 35 insertions, 2 deletions

diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
index 897808b1d..1e0ff7896 100644
--- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
+++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
@@ -6,12 +6,23 @@ MAINTAINER {{ maintainer }}
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set cloudkitty_api_packages = [
+                'openstack-cloudkitty-api',
+        ] %}
+
+    {% elif base_distro in ['ubuntu'] %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
+    {% endif %}
+
 {% endif %}
 
+{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
+
 COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start
 RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start
 
diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
index ff01520d2..40fd42741 100644
--- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
+++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
@@ -6,10 +6,21 @@ MAINTAINER {{ maintainer }}
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set cloudkitty_base_packages = [
+                'openstack-cloudkitty-common',
+        ] %}
+
+    {% elif base_distro in ['ubuntu'] %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
+    {% endif %}
+
+{{ macros.install_packages(cloudkitty_base_packages | customizable("packages")) }}
+
 {% elif install_type == 'source' %}
 
 ADD cloudkitty-base-archive /cloudkitty-base-source
diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
index 9d78b260f..768c406e5 100644
--- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
+++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
@@ -6,12 +6,23 @@ MAINTAINER {{ maintainer }}
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set cloudkitty_processor_packages = [
+                'openstack-cloudkitty-processor',
+        ] %}
+
+    {% elif base_distro in ['ubuntu'] %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
+    {% endif %}
+
 {% endif %}
 
+{{ macros.install_packages(cloudkitty_processor_packages | customizable("packages")) }}
+
 {% block cloudkitty_processor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 041aff2d1..bb9fcb77c 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -79,6 +79,7 @@ MAINTAINER {{ maintainer }}
             'python-cachetools',
             'python-ceilometerclient',
             'python-cliff',
+            'python-cloudkittyclient',
             'python-cmd2',
             'python-congressclient',
             'python-contextlib2',
@@ -303,6 +304,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
         'python-barbicanclient',
         'python-ceilometerclient',
         'python-cinderclient',
+        'python-cloudkittyclient',
         'python-congressclient',
         'python-dateutil',
         'python-designateclient',
diff --git a/tests/test_build.py b/tests/test_build.py
index 786a5e248..b71d26f9d 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -67,7 +67,6 @@ class BuildTest(object):
 class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
     excluded_images = [
         "bifrost-base",
-        "cloudkitty-base",
         "congress-base",
         "freezer-base",
         "kafka",
@@ -141,7 +140,6 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
 class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
     excluded_images = [
         "bifrost-base",
-        "cloudkitty-base",
         "congress-base",
         "freezer-base",
         "kafka",