Remove use of the qemu-pinned element

The fixed version of qemu has been push into fedora
update.

Change-Id: Idf275e576106faf7256eee5d9616d5cd2113479c
This commit is contained in:
Derek Higgins 2015-04-20 09:45:54 +01:00
parent 2511dbed12
commit c2f56e8b23
2 changed files with 1 additions and 4 deletions

View File

@ -113,9 +113,6 @@ function cherrypick(){
# Add cherrypick's here e.g.
# cherrypick <projectname> <gerrit-refspec>
# https://review.openstack.org/#/c/173236/
# patch to fix the pin qemu-img on Fedora 21
cherrypick tripleo-image-elements refs/changes/36/173236/1
# Pin to an earlier puppetlabs-concat
# https://bugs.launchpad.net/tripleo/+bug/1444585

View File

@ -48,7 +48,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
export ELEMENTS_PATH=$TRIPLEO_ROOT/tripleo-puppet-elements/elements:$TRIPLEO_ROOT/heat-templates/hot/software-config/elements:$TRIPLEO_ROOT/tripleo-image-elements/elements
export DELOREAN_REPO_URL="http://trunk.rdoproject.org/f21/ca/06/ca06d64d6131de1f3a8bfca87f0620b27c746976_657408d4"
export RDO_RELEASE=kilo
export DIB_COMMON_ELEMENTS='stackuser os-net-config delorean-repo rdo-release qemu-pinned'
export DIB_COMMON_ELEMENTS='stackuser os-net-config delorean-repo rdo-release'
export USE_MARIADB=0
export SEED_DIB_EXTRA_ARGS='rabbitmq-server mariadb-rpm'
export DIB_DEFAULT_INSTALLTYPE=package