diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-15 18:06:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-15 18:06:44 +0000 |
| commit | c25f67e9d9116c179d871b728ea38dee3acdea02 (patch) | |
| tree | 5361371381ccf9e6586c21b23b5df6d4c2e63a19 /docker | |
| parent | b1017c3592cc4909d0e28bd379aac27b7522718c (diff) | |
| parent | 13d930701c9a672107286dfc03107948e09e367e (diff) | |
| download | kolla-c25f67e9d9116c179d871b728ea38dee3acdea02.tar.gz kolla-c25f67e9d9116c179d871b728ea38dee3acdea02.zip | |
Merge "helm-repository: drop unused os_client_config variable"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/helm-repository/Dockerfile.j2 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index 3734e2856..287fb0f15 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -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")) }} |