Reverting changes on default python

nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db

@@ -27,7 +27,7 @@ TEMPEST_DIR=/opt/git/openstack/tempest
 sudo virtualenv /opt/git/subunit2sql-env
 sudo -H /opt/git/subunit2sql-env/bin/pip install -U subunit2sql testrepository PyMySQL
 
-sudo env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
+sudo env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
 
 sudo chown -R jenkins:jenkins $TEMPEST_DIR/preseed-streams
 

nodepool/elements/nodepool-base/install.d/90-venv-swift-logs → nodepool/elements/nodepool-base/post-install.d/89-jenkins-scripts

 #!/bin/bash
-# Copyright (C) 2015 Rackspace Australia
+# Copyright (C) 2011-2013 OpenStack Foundation
+# Copyright 2016 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,16 +12,23 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 # implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-# dib-lint: disable=setu setpipefail
 if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
     set -x
 fi
-set -e
+set -eu
+set -o pipefail
 
-# Create a virtualenv for zuul-swift-logs
-# This is in /usr instead of /usr/local due to this bug on precise:
-# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
-sudo -H virtualenv /usr/zuul-swift-logs-env
-sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \
-    requests glob2 requestsexceptions
+# NOTE(pabelanger): Until zuulv3 lands, manually copy scripts / data into
+# /usr/local/jenkins.
+mkdir -p /usr/local/jenkins
+cp -a /opt/git/openstack-infra/project-config/jenkins/data \
+    /usr/local/jenkins/common_data
+cp -a /opt/git/openstack-infra/project-config/jenkins/scripts \
+    /usr/local/jenkins/slave_scripts
+# TODO(pabelanger): Stop changing permissions, we really should be setting them
+# within git, not at runtime.
+chmod 0755 -R /usr/local/jenkins

nodepool/elements/slave-db/README.rst

-Install databases on slave nodes