openstack/puppet-openstack-integration
Code Issues Proposed changes

functions: clone poi mitaka when cloning ceph/hammer

Browse Source 
When submitting a patch in puppet-ceph stable/hammer, we want to clone
puppet-openstack-integration from stable/mitaka.

This patch makes sure of that.

Change-Id: I7a7190f0c9e7257f74672d8a8d63678706c63243
This commit is contained in:
Emilien Macchi 2016-08-12 12:42:25 -04:00
parent 49d00974b9
commit b1343de9bc
1 changed files with 2 additions and 0 deletions

2
functions

@ -33,8 +33,10 @@ EOF
# Ceph Jewel works with Newton and beyond. # Ceph Jewel works with Newton and beyond.
if [ "$ZUUL_BRANCH" == "stable/hammer" ] || [ "$ZUUL_BRANCH" == "stable/mitaka" ]; then if [ "$ZUUL_BRANCH" == "stable/hammer" ] || [ "$ZUUL_BRANCH" == "stable/mitaka" ]; then
PUPPET_CEPH_ZUUL_BRANCH='stable/hammer' PUPPET_CEPH_ZUUL_BRANCH='stable/hammer'
ZUUL_BRANCH='stable/mitaka'
else else
PUPPET_CEPH_ZUUL_BRANCH=$ZUUL_BRANCH PUPPET_CEPH_ZUUL_BRANCH=$ZUUL_BRANCH
ZUUL_BRANCH=$ZUUL_BRANCH
fi fi
# Periodic jobs run without ref on master # Periodic jobs run without ref on master