Merge "Build wheel cache for venvs"
diff --git a/README.md b/README.md
index 40060a7..206ffe0 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,9 @@
The DevStack master branch generally points to trunk versions of OpenStack
components. For older, stable versions, look for branches named
stable/[release] in the DevStack repo. For example, you can do the
-following to create a grizzly OpenStack cloud:
+following to create a juno OpenStack cloud:
- git checkout stable/grizzly
+ git checkout stable/juno
./stack.sh
You can also pick specific OpenStack project releases by setting the appropriate
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index a449f49..d3b491f 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -80,7 +80,7 @@
Q: But, but, can't I test on OS/X?
A: Yes, even you, core developer who complained about this, needs to
install bash 4 via homebrew to keep running tests on OS/X. Get a Real
- Operating System. (For most of you who don't know, I am refering to
+ Operating System. (For most of you who don't know, I am referring to
myself.)
Operation and Configuration
@@ -118,13 +118,13 @@
::
[[local|localrc]]
- GLANCE_BRANCH=stable/grizzly
- HORIZON_BRANCH=stable/grizzly
- KEYSTONE_BRANCH=stable/grizzly
- NOVA_BRANCH=stable/grizzly
- GLANCE_BRANCH=stable/grizzly
- NEUTRON_BRANCH=stable/grizzly
- SWIFT_BRANCH=1.10.0
+ GLANCE_BRANCH=stable/juno
+ HORIZON_BRANCH=stable/juno
+ KEYSTONE_BRANCH=stable/juno
+ NOVA_BRANCH=stable/juno
+ GLANCE_BRANCH=stable/juno
+ NEUTRON_BRANCH=stable/juno
+ SWIFT_BRANCH=2.2.1
Q: Why not use [STRIKEOUT:``tools/pip-requires``]\ ``requirements.txt`` to grab project dependencies?
[STRIKEOUT:The majority of deployments will use packages to install
diff --git a/files/debs/n-cpu b/files/debs/n-cpu
index a82304d..534b1c1 100644
--- a/files/debs/n-cpu
+++ b/files/debs/n-cpu
@@ -1,3 +1,4 @@
+qemu-utils
# Stuff for diablo volumes
lvm2
open-iscsi
diff --git a/files/debs/ryu b/files/debs/ryu
deleted file mode 100644
index 354c1b7..0000000
--- a/files/debs/ryu
+++ /dev/null
@@ -1 +0,0 @@
-python-eventlet
diff --git a/files/rpms-suse/ryu b/files/rpms-suse/ryu
deleted file mode 100644
index 354c1b7..0000000
--- a/files/rpms-suse/ryu
+++ /dev/null
@@ -1 +0,0 @@
-python-eventlet
diff --git a/files/rpms/ryu b/files/rpms/ryu
deleted file mode 100644
index 354c1b7..0000000
--- a/files/rpms/ryu
+++ /dev/null
@@ -1 +0,0 @@
-python-eventlet
diff --git a/functions-common b/functions-common
index ecaa4d9..df69cba 100644
--- a/functions-common
+++ b/functions-common
@@ -527,13 +527,6 @@
[[ "$(uname -m)" == "$1" ]]
}
-# Quick check for a rackspace host; n.b. rackspace provided images
-# have these Xen tools installed but a custom image may not.
-function is_rackspace {
- [ -f /usr/bin/xenstore-ls ] && \
- sudo /usr/bin/xenstore-ls vm-data | grep -q "Rackspace"
-}
-
# Determine if current distribution is a Fedora-based distribution
# (Fedora, RHEL, CentOS, etc).
# is_fedora
diff --git a/stackrc b/stackrc
index ee601a9..4353b12 100644
--- a/stackrc
+++ b/stackrc
@@ -459,10 +459,6 @@
NOVNC_REPO=${NOVNC_REPO:-https://github.com/kanaka/noVNC.git}
NOVNC_BRANCH=${NOVNC_BRANCH:-master}
-# ryu service
-RYU_REPO=${RYU_REPO:-https://github.com/osrg/ryu.git}
-RYU_BRANCH=${RYU_BRANCH:-master}
-
# a websockets/html5 or flash powered SPICE console for vm instances
SPICE_REPO=${SPICE_REPO:-http://anongit.freedesktop.org/git/spice/spice-html5.git}
SPICE_BRANCH=${SPICE_BRANCH:-master}