openstack/kolla
Code Issues Proposed changes

Add cloudkitty centos/oracle binary packages

Browse Source 
Also add python-cloudkittyclient pip package
for source installs.

Change-Id: I82a7b3d42ccd527df9e11e857e285a87b6acddf6
This commit is contained in:
Eduardo Gonzalez 2017-01-13 10:33:32 +00:00 committed by Jeffrey Zhang
parent eb1a75fb7f
commit fb1f7f6116
5 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/cloudkitty/cloudkitty-api/Dockerfile.j2
View File

@ -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

11
docker/cloudkitty/cloudkitty-base/Dockerfile.j2
View File

@ -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

11
docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
View File

@ -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 }}

2
docker/openstack-base/Dockerfile.j2
View File

@ -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',

2
tests/test_build.py
View File

@ -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",