openstack/ironic-python-agent
Code Issues Proposed changes

Install qemu-image from backports repo

Browse Source 
qemu-image has been installed from testing to fix issues when
qemu-img can't convert image:
qemu-img: error writing zeroes at sector 0: Invalid argument

The issue has been fixed in qemu 2.2.0-rc2, reference [0].

Which has been added to debian backports.

This patch fixes issue with building coreos image, when qemu-utils
can't be installed from testing due to dependency problems.

Reference:
[0] http://git.qemu-project.org/?p=qemu.git;a=commitdiff;h=f3a9cfddae
[1] https://bugs.launchpad.net/cinder/+bug/1389728

Change-Id: Ie62a88e1d012aba1392b19c18137529c4c3ebf31
Related-Bug: #1490086
Closes-bug: #1570090
Closes-Bug: #1569835
This commit is contained in:
vsaienko
2016-04-13 15:09:31 +03:00
committed by Jay Faulkner
parent 819b79da87
commit 52066d0a49
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@@ -13,9 +13,8 @@ ADD . /tmp/ironic-python-agent
# 1.6. Using the ARG command will be a much cleaner solution. # 1.6. Using the ARG command will be a much cleaner solution.
COPY proxy.sh /usr/bin/proxy.sh COPY proxy.sh /usr/bin/proxy.sh
# Add 'testing' for qemu-utils # Add 'backports' for qemu-utils
RUN echo 'APT::Default-Release "jessie";' > /etc/apt/apt.conf.d/10default && \ RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
sed -e 's/jessie/testing/g' /etc/apt/sources.list > /etc/apt/sources.list.d/testing.list
# Install requirements: Python for ironic-python-agent, others for putting an # Install requirements: Python for ironic-python-agent, others for putting an
# image on disk # image on disk
@@ -24,7 +23,7 @@ RUN proxy.sh apt-get update && \
proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \ proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \
python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \ python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \
bash coreutils tgt dmidecode ipmitool psmisc dosfstools && \ bash coreutils tgt dmidecode ipmitool psmisc dosfstools && \
proxy.sh apt-get --only-upgrade -t testing install -y qemu-utils proxy.sh apt-get --only-upgrade -t jessie-backports install -y qemu-utils
# Some cleanup # Some cleanup
RUN proxy.sh apt-get -y autoremove && \ RUN proxy.sh apt-get -y autoremove && \