move spinup scripts installation to image creation

Change-Id: Iefd20051a9dbd6ea3930c100d772add43bd2e9b7
Signed-off-by: Guy Belotzerkovsky <guy@hpe.com>

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 1e2a0ccacf2499bb193a77fa1246989236fc0a02..575d0072bf0daa547a959421d3e54be92c26fceb 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# 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
+
+# install crudini command line tool for editing config files
+yum install -y crudini
+
 echo '---> Installing non-baseline requirements'
 yum install -y deltarpm nc python{,-{crypto,devel,lxml,setuptools}} \
     @development {lib{xml2,xslt,ffi},openssl}-devel git wget

diff --git a/packer/provision/devstack.sh b/packer/provision/devstack.sh
index 4e08b6e678e14c6a00623f4e07ee9be24b166eda..4671599253042c0a50aa0dba12137c5c3c15c71a 100644 (file)
--- a/packer/provision/devstack.sh
+++ b/packer/provision/devstack.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# 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
+
+# install crudini command line tool for editing config files
+yum install -y crudini
+
 echo '---> Installing non-baseline requirements'
 yum install -y deltarpm python{,-{crypto,devel,lxml,setuptools}} \
     @development {lib{xml2,xslt,ffi},openssl}-devel

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index 653012b63120a7a463d506af3651c6125c046caf..254c87f5a7df9be84cb96f93d2b87344e2ed7e65 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -6,7 +6,8 @@
 # needed by enough to make them useful everywhere
 yum install -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
-    {readline,unixODBC}-devel yum-utils
+    {readline,unixODBC}-devel yum-utils fedora-packager \
+    libxslt-devel crudini
 
 #Install python3 and dependencies
 yum install -y python34

diff --git a/packer/provision/robot.sh b/packer/provision/robot.sh
index 268d6c24f7d94b3b940d253b14baee5d4668c5a0..b24dd1f57aa95f75d76444b0fdcc1250b261ac6c 100644 (file)
--- a/packer/provision/robot.sh
+++ b/packer/provision/robot.sh
@@ -35,6 +35,9 @@ cd udpreplay
 ./configure
 make &> /dev/null && cp udpreplay /usr/local/bin
 
+## Install docker-py and netaddr
+yum install -y -q python-docker-py python-netaddr
+
 #####################
 # DLUX requirements #
 #####################