openstack
/
instack-undercloud
Code Issues Proposed changes

Remove merged cherry-picks and update commit hash of RDO specific patch

This commit is contained in:
James Slagle 2014-12-16 05:46:43 -05:00
parent 6027e6e78b
commit 2ec717ab1f
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,34 +43,10 @@ function do_tripleo_source_installs {
# This patch is RDO specific, as such there is no upstream review for it.
# Change default swift ports
git fetch https://github.com/redhat-openstack/tripleo-image-elements
git cherry-pick da8c680c78f28d99bbfc76fc817ea67b8d0fba9c
git cherry-pick 705ebd4fb9ea2061303598368fa1f913cb408b0e
popd
# https://review.openstack.org/129310
cherry_pick tripleo-image-elements refs/changes/10/129310/2
# https://review.openstack.org/129311
cherry_pick tripleo-image-elements refs/changes/11/129311/2
# Make rdo-release safe to install twice
cherry_pick tripleo-image-elements refs/changes/27/129727/1
# Change how SELinux policies are compiled
# https://review.openstack.org/130420
cherry_pick tripleo-image-elements refs/changes/20/130420/2
# Simplify keepalived custom policy
# https://review.openstack.org/130422
cherry_pick tripleo-image-elements refs/changes/22/130422/2
# Multiple custom policy installs in one operation to save
# time
# https://review.openstack.org/130875
cherry_pick tripleo-image-elements refs/changes/75/130875/1
# Add source and package install for Tuskar client
# Both patches needed, first adds openstack client, otherwise
# there is cherry-pick conflict
cherry_pick tripleo-image-elements refs/changes/08/130608/5
cherry_pick tripleo-image-elements refs/changes/14/130714/12
# tuskar-ui to tuskar-api race condition
cherry_pick tripleo-image-elements refs/changes/14/135814/2
fi
if [ ! -d $INSTACK_ROOT/diskimage-builder ]; then