Merge "Improve pip install process for offline deployment." into stable/train

7 files changed, 14 insertions, 35 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d2f21a99e..512024240 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -337,11 +337,13 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
 ] %}
 {% if distro_python_version.startswith('3') %}
 {% set base_centos_binary_packages = base_centos_binary_packages + [
-        'python3'
+        'python3',
+        'python3-pip'
 ] %}
 {% else %}
 {% set base_centos_binary_packages = base_centos_binary_packages + [
-        'python'
+        'python',
+        'python-pip'
 ] %}
 {% endif %}
 {% if distro_package_manager == 'dnf' %}
@@ -376,11 +378,13 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
 ] %}
 {% if distro_python_version.startswith('3') %}
 {% set base_centos_source_packages = base_centos_source_packages + [
-        'python3'
+        'python3',
+        'python3-pip'
 ] %}
 {% else %}
 {% set base_centos_source_packages = base_centos_source_packages + [
-        'python'
+        'python',
+        'python-pip'
 ] %}
 {% endif %}
 {% if distro_package_manager == 'dnf' %}
@@ -455,6 +459,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    'open-iscsi',
    'procps',
    'python3',
+   'python3-pip',
    'socat',
    'sudo',
    'tgt']
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
index c6a630a88..0c2588ecc 100644
--- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
+++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
@@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     'elasticsearch-curator'
 ] %}
 
-RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \
+RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \
     && mkdir -p /etc/elasticsearch-curator \
     && chown -R elasticsearch: /etc/elasticsearch-curator
 
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 442da59d9..59c77fcce 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -53,7 +53,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
         ] %}
 
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
-RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \
+RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false) }} \
     && truncate -s 0 /etc/apache2/ports.conf
 
     {% endif %}
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2
index 091cc5b1f..1e209da4e 100644
--- a/docker/helm-repository/Dockerfile.j2
+++ b/docker/helm-repository/Dockerfile.j2
@@ -28,10 +28,6 @@ ENV helm_version=2.3.0 \
 {% endif %}
 {{ macros.install_packages(helm_repo_packages | customizable("packages")) }}
 
-{% block helm_repository_source_install_python_pip %}
-{{ macros.get_pip() }}
-{% endblock %}
-
 {% set helm_repository_pip_packages = [
     'pyyaml'
 ] %}
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 980027e24..aacd19f4a 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -70,10 +70,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% endif %}
 {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
 
-{% block kolla_toolbox_source_install_python_pip %}
-{{ macros.get_pip() }}
-{% endblock %}
-
 {% set kolla_toolbox_pip_virtualenv_packages = [
         'virtualenv'
     ] %}
diff --git a/docker/macros.j2 b/docker/macros.j2
index f7d74ec72..052375492 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -36,23 +36,9 @@
 {% endif %}
 {%- endmacro %}
 
-{% macro get_pip() %}
-{% if distro_python_version == '2.7' %}
-    {% set python='python' %}
-{% else %}
-    {% set python='python3' %}
-{% endif %}
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && {{python}} get-pip.py \
-    && rm get-pip.py
-{% endmacro %}
-
-{% macro install_pip(packages, constraints = true, pip_version = pip) %}
+{% macro install_pip(packages, constraints = true) %}
 {%- if packages is sequence and packages|length > 0 -%}
-{%- if not pip_version -%}
-    {%- set pip_version = 'pip' -%}
-{%- endif -%}
-    {{ pip_version }} --no-cache-dir install --upgrade{{ ' ' }}
+    python{{ distro_python_version }} -m pip --no-cache-dir install --upgrade{{ ' ' }}
     {%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%}
     {{ packages | join(' ') }}
 {%- else -%}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 30427bbe1..9ff44b86f 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -276,10 +276,6 @@ ENV DEBIAN_FRONTEND noninteractive
 
 {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
 
-{% block source_install_python_pip %}
-{{ macros.get_pip() }}
-{% endblock %}
-
 {% set openstack_base_pip_packages = [
         'Babel',
         'Mako',
@@ -409,7 +405,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ADD openstack-base-archive /openstack-base-source
 RUN ln -s openstack-base-source/* /requirements \
     && mkdir -p /var/lib/kolla \
-    && {{ macros.install_pip(['virtualenv'], constraints = false)}} \
+    && {{ macros.install_pip(['virtualenv'])}} \
     && virtualenv --system-site-packages /var/lib/kolla/venv
 
 ENV PATH /var/lib/kolla/venv/bin:$PATH