openstack/kolla
Code Issues Proposed changes

Merge "helm-repository: drop unused os_client_config variable"

Browse Source
This commit is contained in:
Zuul 2019-03-15 18:06:44 +00:00 committed by Gerrit Code Review
commit c25f67e9d9
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/helm-repository/Dockerfile.j2
View File

@ -9,8 +9,6 @@ ENV helm_version=2.3.0 \
{% block helm_repository_header %}{% endblock %}
{% set os_client_config='/usr/lib/python2.7/site-packages/os_client_config/defaults.json' %}
{% import "macros.j2" as macros with context %}
{% if base_package_type == 'rpm' %}
@ -27,10 +25,6 @@ ENV helm_version=2.3.0 \
'python-pip'
] %}
{% if base_distro == 'debian' %}
{% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %}
{% endif %}
{% endif %}
{{ macros.install_packages(helm_repo_packages | customizable("packages")) }}