openstack/kolla
Code Issues Proposed changes

Add ceilometermiddleware in swift-proxy-server

Browse Source 
Add ceilometermiddleware package in swift-proxy-server image.

Change-Id: I4075d14211778347afe7c03b661723f5a8e18c7a
Closes-Bug: #1691629
This commit is contained in:
shaofeng_cheng 2017-05-18 14:50:49 +08:00
parent f3ae2d10f4
commit 627f6ce2f4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/swift/swift-proxy-server/Dockerfile.j2
View File

@ -7,13 +7,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_proxy_server_packages = ['swift-proxy'] %} {% set swift_proxy_server_packages = [
'swift-proxy',
'python-ceilometermiddleware'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} {{ 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 %} {% endif %}
{% block swift_proxy_server_footer %}{% endblock %} {% block swift_proxy_server_footer %}{% endblock %}