Change-Id: I8b24421b07c20f4ffaec844cf2096c68e6a3f9de
Sean Dague authored on 2015/09/30 19:20:23... | ... |
@@ -190,51 +190,51 @@ REQUIREMENTS_DIR=$DEST/requirements |
190 | 190 |
|
191 | 191 |
# block storage service |
192 | 192 |
CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git} |
193 |
-CINDER_BRANCH=${CINDER_BRANCH:-master} |
|
193 |
+CINDER_BRANCH=${CINDER_BRANCH:-stable/liberty} |
|
194 | 194 |
|
195 | 195 |
# image catalog service |
196 | 196 |
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git} |
197 |
-GLANCE_BRANCH=${GLANCE_BRANCH:-master} |
|
197 |
+GLANCE_BRANCH=${GLANCE_BRANCH:-stable/liberty} |
|
198 | 198 |
|
199 | 199 |
# heat service |
200 | 200 |
HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git} |
201 |
-HEAT_BRANCH=${HEAT_BRANCH:-master} |
|
201 |
+HEAT_BRANCH=${HEAT_BRANCH:-stable/liberty} |
|
202 | 202 |
|
203 | 203 |
# django powered web control panel for openstack |
204 | 204 |
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git} |
205 |
-HORIZON_BRANCH=${HORIZON_BRANCH:-master} |
|
205 |
+HORIZON_BRANCH=${HORIZON_BRANCH:-stable/liberty} |
|
206 | 206 |
|
207 | 207 |
# baremetal provisioning service |
208 | 208 |
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git} |
209 |
-IRONIC_BRANCH=${IRONIC_BRANCH:-master} |
|
209 |
+IRONIC_BRANCH=${IRONIC_BRANCH:-stable/liberty} |
|
210 | 210 |
|
211 | 211 |
# unified auth system (manages accounts/tokens) |
212 | 212 |
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git} |
213 |
-KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master} |
|
213 |
+KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-stable/liberty} |
|
214 | 214 |
|
215 | 215 |
# neutron service |
216 | 216 |
NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git} |
217 |
-NEUTRON_BRANCH=${NEUTRON_BRANCH:-master} |
|
217 |
+NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/liberty} |
|
218 | 218 |
|
219 | 219 |
# neutron fwaas service |
220 | 220 |
NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git} |
221 |
-NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-master} |
|
221 |
+NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-stable/liberty} |
|
222 | 222 |
|
223 | 223 |
# neutron lbaas service |
224 | 224 |
NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git} |
225 |
-NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master} |
|
225 |
+NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-stable/liberty} |
|
226 | 226 |
|
227 | 227 |
# neutron vpnaas service |
228 | 228 |
NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git} |
229 |
-NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master} |
|
229 |
+NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-stable/liberty} |
|
230 | 230 |
|
231 | 231 |
# compute service |
232 | 232 |
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git} |
233 |
-NOVA_BRANCH=${NOVA_BRANCH:-master} |
|
233 |
+NOVA_BRANCH=${NOVA_BRANCH:-stable/liberty} |
|
234 | 234 |
|
235 | 235 |
# object storage service |
236 | 236 |
SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git} |
237 |
-SWIFT_BRANCH=${SWIFT_BRANCH:-master} |
|
237 |
+SWIFT_BRANCH=${SWIFT_BRANCH:-stable/liberty} |
|
238 | 238 |
|
239 | 239 |
############## |
240 | 240 |
# |
... | ... |
@@ -244,7 +244,7 @@ SWIFT_BRANCH=${SWIFT_BRANCH:-master} |
244 | 244 |
|
245 | 245 |
# consolidated openstack requirements |
246 | 246 |
REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git} |
247 |
-REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-master} |
|
247 |
+REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-stable/liberty} |
|
248 | 248 |
|
249 | 249 |
# Tempest test suite |
250 | 250 |
TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git} |
... | ... |
@@ -15,7 +15,7 @@ |
15 | 15 |
|
16 | 16 |
echo "Ensuring we don't have crazy refs" |
17 | 17 |
|
18 |
-REFS=`grep BRANCH stackrc | grep -v -- '-master'` |
|
18 |
+REFS=`grep BRANCH stackrc | grep -v -- '-master' | grep -v -- '-stable/liberty'` |
|
19 | 19 |
rc=$? |
20 | 20 |
if [[ $rc -eq 0 ]]; then |
21 | 21 |
echo "Branch defaults must be master. Found:" |