Use install-pip macro in most source images

1. Enable customization of pip packages in source
branch of most images
2. All pip packages install uniformly through
install-pip macro, user can easily customize his
own pip command (For example using a mirror)

Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: If09582039f690fa4136e8f33200d5da15e092da7

2 files changed, 12 insertions, 2 deletions

diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2
index 1eab11b02..3e5fd5bbf 100644
--- a/docker/freezer/freezer-api/Dockerfile.j2
+++ b/docker/freezer/freezer-api/Dockerfile.j2
@@ -33,8 +33,13 @@ RUN echo > /etc/apache2/ports.conf
     {% endif %}
 
 ADD freezer-api-archive /freezer-api-source
+
+{% set freezer_api_pip_packages = [
+    '/freezer-api'
+] %}
+
 RUN ln -s freezer-api-source/* freezer-api \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /freezer-api \
+    && {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \
     && cp -r /freezer-api/etc/freezer/* /etc/freezer/
 
 {% endif %}
diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2
index 9c5e81bff..8f138aa03 100644
--- a/docker/freezer/freezer-base/Dockerfile.j2
+++ b/docker/freezer/freezer-base/Dockerfile.j2
@@ -15,10 +15,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 {% elif install_type == 'source' %}
 
 ADD freezer-base-archive /freezer-base-source
+
+{% set freezer_base_pip_packages = [
+    '/freezer'
+] %}
+
 RUN ln -s freezer-base-source/* freezer \
     && mkdir -p /etc/freezer \
     && chown -R freezer: /etc/freezer \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /freezer \
+    && {{ macros.install_pip(freezer_base_pip_packages | customizable("pip_packages")) }} \
     && cp -r /freezer/etc/* /etc/freezer
 
 {% endif %}