From 627f6ce2f46c4ff9753401a5366543cfb5b2a545 Mon Sep 17 00:00:00 2001 From: shaofeng_cheng Date: Thu, 18 May 2017 14:50:49 +0800 Subject: [PATCH] Add ceilometermiddleware in swift-proxy-server Add ceilometermiddleware package in swift-proxy-server image. Change-Id: I4075d14211778347afe7c03b661723f5a8e18c7a Closes-Bug: #1691629 --- docker/swift/swift-proxy-server/Dockerfile.j2 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index e13c6c58c6..4e5aaf4d9c 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -7,13 +7,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set swift_proxy_server_packages = ['openstack-swift-proxy'] %} + {% set swift_proxy_server_packages = [ + 'openstack-swift-proxy', + 'python-ceilometermiddleware' + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set swift_proxy_server_packages = ['swift-proxy'] %} + {% set swift_proxy_server_packages = [ + 'swift-proxy', + 'python-ceilometermiddleware' + ] %} {% endif %} {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} +{% elif install_type == 'source' %} + +{% set swift_proxy_server_pip_packages = [ + 'ceilometermiddleware' +] %} + +RUN {{ macros.install_pip(swift_proxy_server_pip_packages | customizable("pip_packages")) }} + {% endif %} {% block swift_proxy_server_footer %}{% endblock %}