diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 4f6a60530..a2ada0866 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -39,7 +39,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ADD ceilometer-base-archive /ceilometer-base-source ADD plugins-archive / +# NOTE(egonzalez): Remove ceilometer from constraint or will fail. 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")) }} \ && mkdir -p /etc/ceilometer \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index d30e826c4..6b4f80082 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -45,7 +45,8 @@ ADD plugins-archive / ] %} 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 {% endif %} |