move packages to dependency.sh

move packages installation to dependency.sh.
CI image preparation every night can benefit from it too.

Change-Id: Iab64ec9b0044bfff1cf7776b8cf57d0cf2ca8907

install/dependency.sh

@@ -10,7 +10,7 @@ if [ "$tempest" == "true" ]; then
         exit 1
     fi
 fi
-sudo yum install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp mod_wsgi httpd squid dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python unzip openssl openssl098e ca-certificates redis mysql mysql-server mysql-devel python-virtualenv python-setuptools
+sudo yum install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp mod_wsgi httpd squid dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python unzip openssl openssl098e ca-certificates redis mysql mysql-server mysql-devel python-virtualenv python-setuptools bc
 if [[ "$?" != "0" ]]; then
     echo "failed to install yum dependency"
     exit 1

install/install.sh

@@ -119,15 +119,6 @@ else
 fi
 figlet -ctf slant Compass Installer
 
-# Install bc
-sudo yum -y install bc >& /dev/null
-if [[ "$?" != "0" ]]; then
-    echo "failed to install bc"
-    exit 1
-else
-    echo "bc is installed"
-fi
-
 while [ $1 ]; do
   flags=$1
   param=${flags/'--'/''}

misc/ci/prepare_node_compass.sh

@@ -1,15 +1,28 @@
 #!/bin/bash -x
 echo 0 > /selinux/enforce
-yum -y update
+yum clean all
+yum -y update --skip-broken
+yum install -y virt-install libvirt qemu-kvm figlet rsyslog logrotate iproute openssh-clients python git wget python-setuptools python-netaddr python-flask python-flask-sqlalchemy python-amqplib amqp python-paramiko python-mock dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python python-daemon unzip openssl openssl098e createrepo mkisofs python-cheetah python-simplejson python-urlgrabber PyYAML Django cman debmirror pykickstart libxml2-devel libxslt-devel python-devel sshpass bc
+service libvirtd start
 sed -i "s/Defaults    requiretty/#Defaults    requiretty/"  /etc/sudoers
-git clone http://git.openstack.org/stackforge/compass-core
+brctl show |grep installation > /dev/null
+if [[ $? -eq 0 ]] ; then
+    echo "bridge already exists"
+else
+    brctl addbr installation
+    brctl addif installation eth1
+    ifconfig eth1 up
+    dhclient -r eth1
+    dhclient -r installation
+    dhclient installation
+fi
+git clone http://git.openstack.org/stackforge/compass-core -b dev/experimental
 cd compass-core
 source install/install.conf.template
 source install/install.conf
-export tempest=true
+source install/setup_env.sh
 source install/dependency.sh
 source install/prepare.sh
-service libvirtd start
 sync
 sleep 5
 echo "image preparation done"