openstack
/
instack-undercloud
Code Issues Proposed changes

Update cherry picks and $LKG for diskimage-builder

This commit is contained in:
James Slagle 2014-10-22 11:31:33 -04:00
parent 66abbf5f07
commit 09d3abfe44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instack-sourcerc
View File

@ -62,7 +62,7 @@ export PIP_DOWNLOAD_CACHE=~/.cache/pip
if [ "$LKG" = "1" ]; then
# These are set manually, since they're not part of source-repositories
export DIB_REPOREF_tripleo_image_elements=d4cceac4d9d3bec1190fc5378e91a7f03c16a3b6
export DIB_REPOREF_diskimage_builder=97678dcda51cb70637daf8444206041f29e6a765
export DIB_REPOREF_diskimage_builder=233753295411e9c168b8b03ca1ea9c22ddc7c6d2
export DIB_REPOREF_os_cloud_config=a2b5ec4d4d0f22dd58454023324d1245ecdeece7
export DIB_REPOREF_tripleo_incubator=c3fb309727671130a32b4c19de48ec22c8530aa1

8
scripts/instack-install-undercloud-source
View File

@ -77,12 +77,12 @@ function do_tripleo_source_installs {
popd
if [ "$LKG" = "1" ]; then
# Dracut ramdisks - merged upstream but not in LKG yet
cherry_pick diskimage-builder refs/changes/75/105275/12
echo
fi
# https://review.openstack.org/#/c/129305
cherry_pick diskimage-builder refs/changes/05/129305/1
# Move busybox binary-dep to ramdisk element
# https://review.openstack.org/#/c/130034/
cherry_pick diskimage-builder refs/changes/34/130034/1
fi