@@ -320,14 +320,12 @@

         dstat: true

         etcd3: true

         mysql: true

-        peakmem_tracker: true

         rabbit: true

     group-vars:

       subnode:

         devstack_services:

           # Shared services

           dstat: true

-          peakmem_tracker: true

         devstack_localrc:

           # Multinode specific settings

           HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"

@@ -394,7 +392,6 @@

         dstat: true

         etcd3: true

         mysql: true

-        peakmem_tracker: true

         rabbit: true

         tls-proxy: true

         # Keystone services

@@ -450,7 +447,6 @@

           # This list replaces the test-matrix.

           # Shared services

           dstat: true

-          peakmem_tracker: true

           tls-proxy: true

           # Nova services

           n-cpu: true

@@ -1,2 +1 @@

 dstat

-python-psutil

@@ -1,2 +1 @@

 dstat

-python-psutil

@@ -1,3 +1,2 @@

 dstat # not:f29

 pcp-system-tools # dist:f29

-python-psutil

deleted file mode 100644

@@ -1 +0,0 @@

-pip!=8,<10

@@ -89,9 +89,9 @@ function install_get_pip {

             die $LINENO "Download of get-pip.py failed"

         touch $LOCAL_PIP.downloaded

     fi

-    sudo -H -E python $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt

-    if python3_enabled; then

-        sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt

+    sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP

+    if ! python3_enabled; then

+        sudo -H -E python $LOCAL_PIP

     fi

 }