Merge "Update lftools to ~ 0.17.1"

diff --git a/releasenotes/notes/pip-update-7b5d4d3c59c1b2e5.yaml b/releasenotes/notes/pip-update-7b5d4d3c59c1b2e5.yaml
new file mode 100644 (file)
index 0000000..708b417
--- /dev/null
+++ b/releasenotes/notes/pip-update-7b5d4d3c59c1b2e5.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Use `python -m pip` to ensure that we are using the pip version that
+    was installed rather than the OS wrapper version of pip.

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 74807dc..02070b4 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -19,6 +19,6 @@ python-heatclient~=1.16.1
 python-openstackclient~=3.16.0
 EOF
 
-pip install --user --quiet --upgrade pip==18.0 setuptools==40.0.0
-pip install --user --quiet --upgrade -r "$REQUIREMENTS_FILE"
+python -m pip install --user --quiet --upgrade pip~=18.0 setuptools~=40.2.0
+python -m pip install --user --quiet --upgrade -r "$REQUIREMENTS_FILE"
 pip freeze