openstack/cookbook-openstack-common
Code Issues Proposed changes

Remove libvirt from integration images

Browse Source 
- the libvirt packages should be installed by chef, and not preseeded by the
  image

Change-Id: I37f182f8f3e7715c41e1ed0e0799386766bc8d66
This commit is contained in:
Samuel Cassiba
2017-09-11 11:43:04 -07:00
parent ea0f371412
commit 38af6fbeb4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.sh
View File

@@ -7,6 +7,9 @@ if [ -f /usr/bin/yum ] ; then
sudo yum -y groupinstall "Development Tools" sudo yum -y groupinstall "Development Tools"
sudo yum -y install xz-devel zlib-devel sudo yum -y install xz-devel zlib-devel
# workaround for integration. let chef install libvirt later
sudo yum -y remove libvirt libvirt-python
# uninstall requests from pip # uninstall requests from pip
sudo pip uninstall requests -y || true sudo pip uninstall requests -y || true
@@ -25,6 +28,9 @@ elif [ -f /usr/bin/apt-get ]; then
sudo apt-get update sudo apt-get update
sudo apt-get -y install build-essential liblzma-dev zlib1g-dev sudo apt-get -y install build-essential liblzma-dev zlib1g-dev
# workaround for integration. let chef install what it needs later
sudo apt-get -y purge libvirt0 libvirt-dev python-libvirt
# install chefdk # install chefdk
chefdk=chefdk_1.5.0-1_amd64.deb chefdk=chefdk_1.5.0-1_amd64.deb
wget -nv -t 3 https://packages.chef.io/stable/ubuntu/16.04/$chefdk wget -nv -t 3 https://packages.chef.io/stable/ubuntu/16.04/$chefdk