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

5 files changed, 25 insertions, 5 deletions

diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index 609722d60..b0375641c 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -13,8 +13,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 {% elif install_type == 'source' %}
 
 ADD monasca-api-archive /monasca-api-source
+
+{% set monasca_api_pip_packages = [
+    '/monasca-api'
+] %}
+
 RUN ln -s monasca-api-source/* monasca-api \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /monasca-api
+    && {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }}
 
 {% endif %}
 
diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2
index 8c4d9a81e..83c621c6d 100644
--- a/docker/monasca/monasca-log-api/Dockerfile.j2
+++ b/docker/monasca/monasca-log-api/Dockerfile.j2
@@ -14,7 +14,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 ADD monasca-log-api-archive /monasca-log-api-source
 RUN ln -s monasca-log-api-source/* monasca-log \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /monasca-log
+    && {{ macros.install_pip(['/monasca-log'] | customizable("pip_packages")) }}
 
 {% endif %}
 
diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2
index 2ca45bdb6..8433c98f1 100644
--- a/docker/monasca/monasca-notification/Dockerfile.j2
+++ b/docker/monasca/monasca-notification/Dockerfile.j2
@@ -13,8 +13,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 {% elif install_type == 'source' %}
 
 ADD monasca-notification-archive /monasca-notification-source
+
+{% set monasca_notification_pip_packages = [
+    '/monasca-notification'
+] %}
+
 RUN ln -s monasca-notification-source/* monasca-notification \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /monasca-notification
+    && {{ macros.install_pip(monasca_notification_pip_packages | customizable("pip_packages")) }}
 
 {% endif %}
 
diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2
index e9bce5b39..a48a46431 100644
--- a/docker/monasca/monasca-persister/Dockerfile.j2
+++ b/docker/monasca/monasca-persister/Dockerfile.j2
@@ -13,8 +13,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 {% elif install_type == 'source' %}
 
 ADD monasca-persister-archive /monasca-persister-source
+
+{% set monasca_persister_pip_packages = [
+    '/monasca-persister'
+] %}
+
 RUN ln -s monasca-persister-source/* monasca-persister \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /monasca-persister
+    && {{ macros.install_pip(monasca_persister_pip_packages | customizable("pip_packages")) }}
 
 {% endif %}
 
diff --git a/docker/monasca/monasca-statsd/Dockerfile.j2 b/docker/monasca/monasca-statsd/Dockerfile.j2
index 6399e1acd..3320f4e2a 100644
--- a/docker/monasca/monasca-statsd/Dockerfile.j2
+++ b/docker/monasca/monasca-statsd/Dockerfile.j2
@@ -13,10 +13,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 {% elif install_type == 'source' %}
 
 ADD monasca-statsd-archive /monasca-statsd-source
+
+{% set monasca_statsd_pip_packages = [
+    '/monasca-statsd'
+] %}
+
 # NOTE(SamYaple): <=1.3.0 do not have any packages in requirements.txt and that
 # breaks pip. So removing constraints file.
 RUN ln -s monasca-statsd-source/* monasca-statsd \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade /monasca-statsd
+    && {{ macros.install_pip(monasca_statsd_pip_packages | customizable("pip_packages"), constraints = false) }}
 
 {% endif %}