Merge "Add ceilometermiddleware in swift-proxy-server"

1 files changed, 16 insertions, 2 deletions

diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index e13c6c58c..4e5aaf4d9 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 %}