1. devstack
  2. Commit 279a7589b03db69fd1b85d947cd0171dacef94ee
Browse code

Revert "Do not use pip 10 or higher"

This reverts commit f99d1771ba1882dfbb69186212a197edae3ef02c.

Added workarounds that might want to get split into their own patch
before merging:

- Don't install python-psutil
- Don't run peakmem_tracker

Change-Id: If4fb16555e15082a4d97cffdf3cfa608a682997d

Jens Harbott (frickler) authored on 2018/04/16 21:08:30
Showing 6 changed files
.zuul.yaml
History View file @ 279a758
... ... 
@@ -320,14 +320,12 @@
320 320 
         dstat: true
321 321 
         etcd3: true
322 322 
         mysql: true
323 
-        peakmem_tracker: true
324 323 
         rabbit: true
325 324 
     group-vars:
326 325 
       subnode:
327 326 
         devstack_services:
328 327 
           # Shared services
329 328 
           dstat: true
330 
-          peakmem_tracker: true
331 329 
         devstack_localrc:
332 330 
           # Multinode specific settings
333 331 
           HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"
... ... 
@@ -394,7 +392,6 @@
394 394 
         dstat: true
395 395 
         etcd3: true
396 396 
         mysql: true
397 
-        peakmem_tracker: true
398 397 
         rabbit: true
399 398 
         tls-proxy: true
400 399 
         # Keystone services
... ... 
@@ -450,7 +447,6 @@
450 450 
           # This list replaces the test-matrix.
451 451 
           # Shared services
452 452 
           dstat: true
453 
-          peakmem_tracker: true
454 453 
           tls-proxy: true
455 454 
           # Nova services
456 455 
           n-cpu: true
files/debs/dstat
History View file @ 279a758
... ... 
@@ -1,2 +1 @@
1 1 
 dstat
2 
-python-psutil
files/rpms-suse/dstat
History View file @ 279a758
... ... 
@@ -1,2 +1 @@
1 1 
 dstat
2 
-python-psutil
files/rpms/dstat
History View file @ 279a758
... ... 
@@ -1,3 +1,2 @@
1 1 
 dstat # not:f29
2 2 
 pcp-system-tools # dist:f29
3 
-python-psutil
tools/cap-pip.txt
History View file @ 279a758
4 3 
deleted file mode 100644
... ... 
@@ -1 +0,0 @@
1 
-pip!=8,<10
tools/install_pip.sh
History View file @ 279a758
... ... 
@@ -89,9 +89,9 @@ function install_get_pip {
89 89 
             die $LINENO "Download of get-pip.py failed"
90 90 
         touch $LOCAL_PIP.downloaded
91 91 
     fi
92 
-    sudo -H -E python $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
93 
-    if python3_enabled; then
94 
-        sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
92 
+    sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP
93 
+    if ! python3_enabled; then
94 
+        sudo -H -E python $LOCAL_PIP
95 95 
     fi
96 96 
 }
97 97