Merge "support installing django_openstack_auth from pypi"
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 0a4746f..f1f7e8f 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -22,3 +22,4 @@
tcpdump
unzip
wget
+net-tools
diff --git a/files/rpms/general b/files/rpms/general
index d4a9fcb..d7ace9b 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -27,6 +27,7 @@
bc
libyaml-devel
gettext # used for compiling message catalogs
+net-tools
# [1] : some of installed tools have unversioned dependencies on this,
# but others have versioned (<=0.7). So if a later version (0.7.1)
diff --git a/stackrc b/stackrc
index a404ad8..4849012 100644
--- a/stackrc
+++ b/stackrc
@@ -219,7 +219,7 @@
# volume client
GITREPO["python-cinderclient"]=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git}
-GITBRACH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master}
+GITBRANCH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master}
# python glance client library
GITREPO["python-glanceclient"]=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}