Merge "Disable all Oxygen Jobs to save infra resources"

[releng/builder.git] / packer / provision / devstack.sh

diff --git a/packer/provision/devstack.sh b/packer/provision/devstack.sh
index 7583344d24f383713c5879d1d9fc4bf15726370f..a420da9dcbbb2c7608027984a5c9b4101baf631c 100644 (file)
--- a/packer/provision/devstack.sh
+++ b/packer/provision/devstack.sh
@@ -1,12 +1,10 @@
 #!/bin/bash
 
 # force any errors to cause the script and job to end in failure
-set -xeu -o pipefile
+set -xeu -o pipefail
 
-# add in a test copr repo
-wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-odl-updates-epel-7.repo -O /etc/yum.repos.d/tykeal-odl-updates-epel-7.repo
 # Install xpath
-yum install -y perl-XML-XPath python-pip python-six
+yum install -y perl-XML-XPath python-pip
 
 # install crudini command line tool for editing config files
 yum install -y crudini