openstack/kolla
Code Issues Proposed changes

Test Fix ceilometer source builds

Browse Source 
Remove ceilometer from constraints to fix the build.

Change-Id: I992cf177944df8da3026a8b3deabf5f10051959c
This commit is contained in:
Eduardo Gonzalez 2018-09-18 12:42:52 +02:00
parent 3d4e284e13
commit fc7eb5a9c7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
ADD ceilometer-base-archive /ceilometer-base-source ADD ceilometer-base-archive /ceilometer-base-source
ADD plugins-archive / ADD plugins-archive /
# NOTE(egonzalez): Remove ceilometer from constraint or will fail.
RUN ln -s ceilometer-base-source/* ceilometer \ RUN ln -s ceilometer-base-source/* ceilometer \
&& sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \
&& {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \ && {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/ceilometer \ && mkdir -p /etc/ceilometer \
&& cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \

3
docker/neutron/neutron-server-opendaylight/Dockerfile.j2
View File

@ -45,7 +45,8 @@ ADD plugins-archive /
] %} ] %}
RUN if [ "$(ls /plugins)" ]; then \ RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \ sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \
&& {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \
fi fi
{% endif %} {% endif %}