Remove usage of get-pip.py

Co-Authored-By: Sam Yaple <sam@yaple.net>
Change-Id: I3018bfb361dcc576e529bad079142597e2cd2508

centos/Dockerfile

@@ -17,7 +17,6 @@ RUN set -x \
         make \
         openssl-devel \
         ca-certificates \
-        curl \
         git \
         bzip2 \
         liberasurecode-devel \
@@ -35,17 +34,16 @@ RUN set -x \
         pkgconfig \
         python \
         python-devel \
+        python-pip \
         libgcrypt \
         nss-util \
         systemd-devel \
-    && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py \
     && mkdir /root/packages \
     && git init /tmp/requirements \
     && git --git-dir /tmp/requirements/.git fetch --depth 1 $PROJECT_REPO $PROJECT_REF \
     && git --work-tree /tmp/requirements --git-dir /tmp/requirements/.git checkout FETCH_HEAD \
     && mv /tmp/requirements/global-requirements.txt /tmp/requirements/upper-constraints.txt /root/packages/ \
+    && pip install -U pip wheel setuptools \
     # NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
     && sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
     && pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \

centos/override/etc/yum.repos.d/CentOS-OpenStack.repo

@@ -4,7 +4,7 @@
 # repos. This might be a problem and is something to watch.
 # TODO(SamYaple): Find out more info on this subject
 [centos-openstack-ocata]
-includepkgs=liberasurecode*
+includepkgs=liberasurecode* python-pip*
 name=CentOS-7 - OpenStack Ocata
 baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-ocata/
 gpgcheck=1

debian/Dockerfile

@@ -12,7 +12,6 @@ RUN set -x \
     && apt-get install -y --no-install-recommends \
         build-essential \
         ca-certificates \
-        curl \
         git \
         liberasurecode-dev \
         libffi-dev \
@@ -31,14 +30,15 @@ RUN set -x \
         libz-dev \
         pkg-config \
         python-dev \
-    && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py \
+        python-pip \
     && mkdir /root/packages \
     && git init /tmp/requirements \
     && git --git-dir /tmp/requirements/.git fetch --depth 1 $PROJECT_REPO $PROJECT_REF \
     && git --work-tree /tmp/requirements --git-dir /tmp/requirements/.git checkout FETCH_HEAD \
     && mv /tmp/requirements/global-requirements.txt /tmp/requirements/upper-constraints.txt /root/packages/ \
+    && pip install -U pip wheel setuptools \
+    # TODO(pbourke): 'hash -r' should no longer be required once we move to stretch
+    && hash -r \
     # NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
     && sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
     && pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
@@ -52,7 +52,6 @@ RUN set -x \
     && apt-get purge -y --auto-remove \
         build-essential \
         ca-certificates \
-        curl \
         git \
         liberasurecode-dev \
         libffi-dev \

ubuntu/Dockerfile

@@ -12,7 +12,6 @@ RUN set -x \
     && apt-get install -y --no-install-recommends \
         build-essential \
         ca-certificates \
-        curl \
         git \
         liberasurecode-dev \
         libffi-dev \
@@ -31,14 +30,13 @@ RUN set -x \
         pkg-config \
         python \
         python-dev \
-    && curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
-    && python get-pip.py \
-    && rm get-pip.py \
+        python-pip \
     && mkdir /root/packages \
     && git init /tmp/requirements \
     && git --git-dir /tmp/requirements/.git fetch --depth 1 $PROJECT_REPO $PROJECT_REF \
     && git --work-tree /tmp/requirements --git-dir /tmp/requirements/.git checkout FETCH_HEAD \
     && mv /tmp/requirements/global-requirements.txt /tmp/requirements/upper-constraints.txt /root/packages/ \
+    && pip install -U pip wheel setuptools \
     # NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
     && sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
     && pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
@@ -52,7 +50,6 @@ RUN set -x \
     && apt-get purge -y --auto-remove \
         build-essential \
         ca-certificates \
-        curl \
         git \
         liberasurecode-dev \
         libffi-dev \