Update devstack vagrant definition for private cloud

[releng/builder.git] / vagrant / ovsdb-devstack / bootstrap.sh

diff --git a/vagrant/ovsdb-devstack/bootstrap.sh b/vagrant/ovsdb-devstack/bootstrap.sh
index 839c4500e42c0b27819cce938f73d214c25884d5..06463517d3d19f6f68ddca0027234e5354062267 100644 (file)
--- a/vagrant/ovsdb-devstack/bootstrap.sh
+++ b/vagrant/ovsdb-devstack/bootstrap.sh
@@ -1,26 +1,10 @@
 #!/bin/bash
 
-# enable enforcing mode from the very start
-setenforce enforcing
-
-# configure system for enforcing mode on next boot
-sed -i 's/SELINUX=permissive/SELINUX=enforcing/' /etc/selinux/config
-
-yum clean all
-yum update -y
+echo '---> Installing non-baseline requirements'
 yum install -q -y deltarpm python{,-{crypto,devel,lxml,setuptools}} \
-    @development {lib{xml2,xslt,ffi},openssl}-devel \
-    java git sudo
-
-# figure out what the latest kernel installed is and switch to it
-# NOTE: This is done like this becase the Rackspace F20 images are using
-# extlinux / syslinux and don't switch to the newest kernel on update
-NEWKERNEL=`rpm -qa | grep kernel-3 | sort -r | head -1 | cut -c 8-`
-if [ -f /boot/extlinux.conf ]; then
-    BOOTLABEL=`grep ${NEWKERNEL} /boot/extlinux.conf | grep LABEL | cut -c 7-`
-    sed -i "s/ONTIMEOUT linux/ONTIMEOUT ${BOOTLABEL}/" /boot/extlinux.conf
-fi
+    @development {lib{xml2,xslt,ffi},openssl}-devel
 
+echo '---> Updating net link setup'
 if [ ! -f /etc/udev/rules.d/80-net-setup-link.rules ]; then
     ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
 fi