openstack/devstack
Code Issues Proposed changes

Merge "Revert "Do not use pip 10 or higher""

Browse Source
This commit is contained in:
Zuul 2020-01-21 18:36:06 +00:00 committed by Gerrit Code Review
commit 5ae6f5ec37
6 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -320,14 +320,12 @@
dstat: true dstat: true
etcd3: true etcd3: true
mysql: true mysql: true
peakmem_tracker: true
rabbit: true rabbit: true
group-vars: group-vars:
subnode: subnode:
devstack_services: devstack_services:
# Shared services # Shared services
dstat: true dstat: true
peakmem_tracker: true
devstack_localrc: devstack_localrc:
# Multinode specific settings # Multinode specific settings
HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}" HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"
@ -394,7 +392,6 @@
dstat: true dstat: true
etcd3: true etcd3: true
mysql: true mysql: true
peakmem_tracker: true
rabbit: true rabbit: true
tls-proxy: true tls-proxy: true
# Keystone services # Keystone services
@ -450,7 +447,6 @@
# This list replaces the test-matrix. # This list replaces the test-matrix.
# Shared services # Shared services
dstat: true dstat: true
peakmem_tracker: true
tls-proxy: true tls-proxy: true
# Nova services # Nova services
n-cpu: true n-cpu: true

1
files/debs/dstat
View File

@ -1,2 +1 @@
dstat dstat
python-psutil

1
files/rpms-suse/dstat
View File

@ -1,2 +1 @@
dstat dstat
python-psutil

1
files/rpms/dstat
View File

@ -1,3 +1,2 @@
dstat # not:f29 dstat # not:f29
pcp-system-tools # dist:f29 pcp-system-tools # dist:f29
python-psutil

1
tools/cap-pip.txt
View File

@ -1 +0,0 @@
pip!=8,<10

6
tools/install_pip.sh
View File

@ -89,9 +89,9 @@ function install_get_pip {
die $LINENO "Download of get-pip.py failed" die $LINENO "Download of get-pip.py failed"
touch $LOCAL_PIP.downloaded touch $LOCAL_PIP.downloaded
fi fi
sudo -H -E python $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP
if python3_enabled; then if ! python3_enabled; then
sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt sudo -H -E python $LOCAL_PIP
fi fi
} }