From fb1f7f6116c31f5c0976f497cfe75c9e3cf58c81 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Fri, 13 Jan 2017 10:33:32 +0000 Subject: Add cloudkitty centos/oracle binary packages Also add python-cloudkittyclient pip package for source installs. Change-Id: I82a7b3d42ccd527df9e11e857e285a87b6acddf6 --- docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 11 +++++++++++ docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 11 +++++++++++ docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 | 11 +++++++++++ docker/openstack-base/Dockerfile.j2 | 2 ++ 4 files changed, 35 insertions(+) (limited to 'docker') 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', -- cgit v1.2.3