Change-Id: I5c100164eba416677257d7bec4c07c15fde0b944
Sean Dague authored on 2016/03/22 21:47:23... | ... |
@@ -205,47 +205,47 @@ REQUIREMENTS_DIR=$DEST/requirements |
205 | 205 |
|
206 | 206 |
# block storage service |
207 | 207 |
CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git} |
208 |
-CINDER_BRANCH=${CINDER_BRANCH:-master} |
|
208 |
+CINDER_BRANCH=${CINDER_BRANCH:-stable/mitaka} |
|
209 | 209 |
|
210 | 210 |
# image catalog service |
211 | 211 |
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git} |
212 |
-GLANCE_BRANCH=${GLANCE_BRANCH:-master} |
|
212 |
+GLANCE_BRANCH=${GLANCE_BRANCH:-stable/mitaka} |
|
213 | 213 |
|
214 | 214 |
# heat service |
215 | 215 |
HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git} |
216 |
-HEAT_BRANCH=${HEAT_BRANCH:-master} |
|
216 |
+HEAT_BRANCH=${HEAT_BRANCH:-stable/mitaka} |
|
217 | 217 |
|
218 | 218 |
# django powered web control panel for openstack |
219 | 219 |
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git} |
220 |
-HORIZON_BRANCH=${HORIZON_BRANCH:-master} |
|
220 |
+HORIZON_BRANCH=${HORIZON_BRANCH:-stable/mitaka} |
|
221 | 221 |
|
222 | 222 |
# unified auth system (manages accounts/tokens) |
223 | 223 |
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git} |
224 |
-KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master} |
|
224 |
+KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-stable/mitaka} |
|
225 | 225 |
|
226 | 226 |
# neutron service |
227 | 227 |
NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git} |
228 |
-NEUTRON_BRANCH=${NEUTRON_BRANCH:-master} |
|
228 |
+NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/mitaka} |
|
229 | 229 |
|
230 | 230 |
# neutron fwaas service |
231 | 231 |
NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git} |
232 |
-NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-master} |
|
232 |
+NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-stable/mitaka} |
|
233 | 233 |
|
234 | 234 |
# neutron lbaas service |
235 | 235 |
NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git} |
236 |
-NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master} |
|
236 |
+NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-stable/mitaka} |
|
237 | 237 |
|
238 | 238 |
# neutron vpnaas service |
239 | 239 |
NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git} |
240 |
-NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master} |
|
240 |
+NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-stable/mitaka} |
|
241 | 241 |
|
242 | 242 |
# compute service |
243 | 243 |
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git} |
244 |
-NOVA_BRANCH=${NOVA_BRANCH:-master} |
|
244 |
+NOVA_BRANCH=${NOVA_BRANCH:-stable/mitaka} |
|
245 | 245 |
|
246 | 246 |
# object storage service |
247 | 247 |
SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git} |
248 |
-SWIFT_BRANCH=${SWIFT_BRANCH:-master} |
|
248 |
+SWIFT_BRANCH=${SWIFT_BRANCH:-stable/mitaka} |
|
249 | 249 |
|
250 | 250 |
############## |
251 | 251 |
# |
... | ... |
@@ -255,7 +255,7 @@ SWIFT_BRANCH=${SWIFT_BRANCH:-master} |
255 | 255 |
|
256 | 256 |
# consolidated openstack requirements |
257 | 257 |
REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git} |
258 |
-REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-master} |
|
258 |
+REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-stable/mitaka} |
|
259 | 259 |
|
260 | 260 |
# Tempest test suite |
261 | 261 |
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/mitaka'` |
|
19 | 19 |
rc=$? |
20 | 20 |
if [[ $rc -eq 0 ]]; then |
21 | 21 |
echo "Branch defaults must be master. Found:" |