openstack/devstack
Code Issues Proposed changes

Merge "Quantum/plugins/ryu: minor update for Quantum Ryu plugin"

Browse Source
This commit is contained in:
Jenkins 2013-02-10 04:55:49 +00:00 committed by Gerrit Code Review
commit 815eca770b
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/apts/ryu
View File

@ -1,4 +1,5 @@
python-setuptools python-setuptools
python-gevent python-gevent
python-gflags python-gflags
python-netifaces
python-sphinx python-sphinx

1
files/rpms/ryu
View File

@ -1,4 +1,5 @@
python-setuptools python-setuptools
python-gevent python-gevent
python-gflags python-gflags
python-netifaces
python-sphinx python-sphinx

3
lib/quantum_plugins/ryu
View File

@ -15,6 +15,9 @@ function quantum_plugin_create_nova_conf() {
function quantum_plugin_install_agent_packages() { function quantum_plugin_install_agent_packages() {
_quantum_ovs_base_install_agent_packages _quantum_ovs_base_install_agent_packages
# quantum_ryu_agent requires ryu module
install_ryu
} }
function quantum_plugin_configure_common() { function quantum_plugin_configure_common() {

10
lib/quantum_thirdparty/ryu vendored
View File

@ -49,8 +49,16 @@ function init_ryu() {
echo "${RYU_CONF_CONTENTS}" > $RYU_CONF echo "${RYU_CONF_CONTENTS}" > $RYU_CONF
} }
# install_ryu can be called multiple times as quantum_pluing/ryu may call
# this function for quantum-ryu-agent
# Make this function idempotent and avoid cloning same repo many times
# with RECLONE=yes
_RYU_INSTALLED=${_RYU_INSTALLED:-False}
function install_ryu() { function install_ryu() {
git_clone $RYU_REPO $RYU_DIR $RYU_BRANCH if [[ "$_RYU_INSTALLED" == "False" ]]; then
git_clone $RYU_REPO $RYU_DIR $RYU_BRANCH
_RYU_INSTALLED=True
fi
} }
function start_ryu() { function start_ryu() {