|
...
|
...
|
@@ -16,7 +16,7 @@ NOVNC_BRANCH=master
|
|
16
|
16
|
|
|
17
|
17
|
# django powered web control panel for openstack
|
|
18
|
18
|
DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git
|
|
19
|
|
-DASH_BRANCH=diablo
|
|
|
19
|
+DASH_BRANCH=master
|
|
20
|
20
|
|
|
21
|
21
|
# python client library to nova that dashboard (and others) use
|
|
22
|
22
|
NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git
|
|
...
|
...
|
@@ -25,7 +25,7 @@ NOVACLIENT_BRANCH=master
|
|
25
|
25
|
# openstackx is a collection of extensions to openstack.compute & nova
|
|
26
|
26
|
# that is *deprecated*. The code is being moved into python-novaclient & nova.
|
|
27
|
27
|
OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
|
|
28
|
|
-OPENSTACKX_BRANCH=master
|
|
|
28
|
+OPENSTACKX_BRANCH=diablo
|
|
29
|
29
|
|
|
30
|
30
|
# allow local overrides of env variables
|
|
31
|
31
|
if [ -f ./localrc ]; then
|