Remove ryu plugin from packages

Ryu plugin was removed from Neutron in upstream

Change-Id: I0734c3452e2f5125917d454dd5a32d1db0d96373

diff --git a/debian/control b/debian/control
index 73ab255c408d91da66e962ce896c78ab30008742..f72c07f16e7627931079622343c88433e6ebae22 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -581,49 +581,6 @@ Description: Neutron is a virtual network service for Openstack - linuxbridge pl
  .
  This package provides the linuxbridge plugin agent.
 
-Package: neutron-plugin-ryu
-Architecture: all
-Provides: neutron-plugin
-Depends:
- neutron-common (= ${source:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Breaks: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ )
-Description: Neutron is a virtual network service for Openstack - RYU plugin
- Neutron is a virtual network service for Openstack, and a part of
- Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Neutron provides an API to
- dynamically request and configure virtual networks. These networks
- connect "interfaces" from other OpenStack services (e.g., virtual NICs
- from Nova VMs). The Neutron API supports extensions to provide
- advanced network capabilities (e.g., QoS, ACLs, network monitoring,
- etc.)
- .
- This package provides the RYU plugin.
-
-Package: neutron-plugin-ryu-agent
-Architecture: all
-Depends:
- neutron-plugin-ryu (= ${source:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Breaks: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ )
-Description: Neutron is a virtual network service for Openstack - RYU plugin agent
- Neutron is a virtual network service for Openstack, and a part of
- Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Neutron provides an API to
- dynamically request and configure virtual networks. These networks
- connect "interfaces" from other OpenStack services (e.g., virtual NICs
- from Nova VMs). The Neutron API supports extensions to provide
- advanced network capabilities (e.g., QoS, ACLs, network monitoring,
- etc.)
- .
- This package provides the RYU plugin agent.
-
 Package: neutron-plugin-midonet
 Architecture: all
 Provides: neutron-plugin

diff --git a/debian/mans/neutron-ryu-agent.8 b/debian/mans/neutron-ryu-agent.8
deleted file mode 100644 (file)
index 8823f9d..0000000
--- a/debian/mans/neutron-ryu-agent.8
+++ /dev/null
@@ -1,11 +0,0 @@
-.TH neutron\-ryu\-agent 8
-.SH NAME
-neutron\-ryu\-agent \- OpenStack Virtual network service \- ryu agent
-
-.SH SYNOPSIS
-.B neutron\-ryu\-agent
-
-.SH DESCRIPTION
-.B neutron\-ryu\-agent
-
-This man page is a stub. Please contribute.

diff --git a/debian/neutron-plugin-ryu-agent.install b/debian/neutron-plugin-ryu-agent.install
deleted file mode 100644 (file)
index 0cddfcd..0000000
--- a/debian/neutron-plugin-ryu-agent.install
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d
-usr/bin/neutron-ryu-agent usr/bin

diff --git a/debian/neutron-plugin-ryu-agent.logrotate b/debian/neutron-plugin-ryu-agent.logrotate
deleted file mode 100644 (file)
index 5f83d5f..0000000
--- a/debian/neutron-plugin-ryu-agent.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/neutron/ryu-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}

diff --git a/debian/neutron-plugin-ryu-agent.manpages b/debian/neutron-plugin-ryu-agent.manpages
deleted file mode 100644 (file)
index 3ec855d..0000000
--- a/debian/neutron-plugin-ryu-agent.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/mans/neutron-ryu-agent.8

diff --git a/debian/neutron-plugin-ryu-agent.upstart b/debian/neutron-plugin-ryu-agent.upstart
deleted file mode 100644 (file)
index a18472e..0000000
--- a/debian/neutron-plugin-ryu-agent.upstart
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim:set ft=upstart ts=2 et:
-description "Neutron RYU Plugin Agent"
-author "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-chdir /var/run
-
-pre-start script
-  mkdir -p /var/run/neutron
-  chown neutron:root /var/run/neutron
-end script
-
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ryu-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ryu/ryu.ini --log-file=/var/log/neutron/ryu-agent.log

diff --git a/debian/neutron-plugin-ryu.install b/debian/neutron-plugin-ryu.install
deleted file mode 100644 (file)
index 8f8bca4..0000000
--- a/debian/neutron-plugin-ryu.install
+++ /dev/null
@@ -1 +0,0 @@
-etc/neutron/plugins/ryu/* etc/neutron/plugins/ryu

diff --git a/debian/tests/control b/debian/tests/control
index eb7751cbef790c25d7d9a8b7171037aaf6caa06e..2de9b23d6d9d83c31b90c0861a2b8275e4777465 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin
  hyperv-plugin brocade-plugin plumgrid-plugin vmware-plugin openvswitch-plugin
- linuxbridge-plugin ryu-plugin midonet-plugin
+ linuxbridge-plugin midonet-plugin
 Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent,
  neutron-lbaas-agent, python-neutron, rabbitmq-server
 Restrictions: needs-root allow-stderr

diff --git a/debian/tests/ryu-plugin b/debian/tests/ryu-plugin
deleted file mode 100644 (file)
index a3260a5..0000000
--- a/debian/tests/ryu-plugin
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#-------------------
-# Testing ryu-plugin
-#-------------------
-set -e
-apt-get -y install neutron-plugin-ryu
-
-# update plugin path
-sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/ryu\/ryu\.ini\"/g' /etc/default/neutron-server
-sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.ryu\.ryu_neutron_plugin\.RyuNeutronPluginV2/g' /etc/neutron/neutron.conf
-service neutron-server restart  > /dev/null 2>&1
-if pidof -x neutron-server > /dev/null; then
-    apt-get -y remove --purge neutron-plugin-ryu
-    echo "OK"
-else
-    echo "ERROR: RYU PLUGIN IS NOT RUNNING"
-    apt-get -y remove --purge neutron-plugin-ryu
-    exit 1
-fi

diff --git a/rpm/SOURCES/neutron-ryu-agent.init b/rpm/SOURCES/neutron-ryu-agent.init
deleted file mode 100644 (file)
index 89dcace..0000000
--- a/rpm/SOURCES/neutron-ryu-agent.init
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# neutron-ryu-agent  OpenStack Ryu Network OS plugin
-#
-# chkconfig:   - 98 02
-# description: Support virtual networks using Ryu Network OS
-### END INIT INFO
-
-. /etc/rc.d/init.d/functions
-
-proj=neutron
-plugin=ryu-agent
-prog=$proj-$plugin
-exec="/usr/bin/$prog"
-configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
-    "/etc/$proj/$proj.conf" \
-    "/etc/$proj/plugins/ryu/ryu.ini" \
-)
-pidfile="/var/run/$proj/$prog.pid"
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    for config in ${configs[@]}; do
-        [ -f $config ] || exit 6
-    done
-    echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    status -p $pidfile $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?

diff --git a/rpm/SOURCES/neutron-ryu-agent.upstart b/rpm/SOURCES/neutron-ryu-agent.upstart
deleted file mode 100644 (file)
index d596d94..0000000
--- a/rpm/SOURCES/neutron-ryu-agent.upstart
+++ /dev/null
@@ -1,8 +0,0 @@
-description "OpenStack Neutron Ryu Network Operating System Agent"
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [S016]
-
-respawn
-
-exec su -s /bin/sh -c "exec /usr/bin/neutron-ryu-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ryu/ryu.ini --log-file /var/log/neutron/ryu-agent.log" neutron

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index 159e3a67fcd12f6fa27b509c1ac9c235b1cc14ec..2741dc2dc243cad6a036c111b0b2e36fe6db7ad2 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -22,8 +22,6 @@ Source11:     neutron-linuxbridge-agent.init
 Source21:      neutron-linuxbridge-agent.upstart
 Source12:      neutron-openvswitch-agent.init
 Source22:      neutron-openvswitch-agent.upstart
-Source13:      neutron-ryu-agent.init
-Source23:      neutron-ryu-agent.upstart
 Source14:      neutron-nec-agent.init
 Source24:      neutron-nec-agent.upstart
 Source15:      neutron-dhcp-agent.init
@@ -77,7 +75,6 @@ Requires:   openstack-neutron-cisco
 Requires:   openstack-neutron-hyperv
 Requires:   openstack-neutron-vmware
 Requires:   openstack-neutron-openvswitch
-Requires:   openstack-neutron-ryu
 Requires:   openstack-neutron-linuxbridge
 Requires:   openstack-neutron-metaplugin
 Requires:   openstack-neutron-mellanox
@@ -396,24 +393,6 @@ This package contains the neutron plugin that implements virtual
 networks using the PLUMgrid platform.
 
 
-%package ryu
-Summary:       Neutron Ryu plugin
-Group:         Applications/System
-
-Provides:      openstack-quantum-ryu = %{version}-%{release}
-Obsoletes:     openstack-quantum-ryu < 2013.2-0.3.b3
-
-Requires:      openstack-neutron = %{version}-%{release}
-
-
-%description ryu
-Neutron provides an API to dynamically request and configure virtual
-networks.
-
-This package contains the neutron plugin that implements virtual
-networks using the Ryu Network Operating System.
-
-
 %package nec
 Summary:       Neutron NEC plugin
 Group:         Applications/System
@@ -562,7 +541,6 @@ install -p -D -m 440 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudoers.d/neutron
 install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/neutron-server
 install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/neutron-linuxbridge-agent
 install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/neutron-openvswitch-agent
-install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/neutron-ryu-agent
 install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/neutron-nec-agent
 install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/neutron-dhcp-agent
 install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/neutron-l3-agent
@@ -583,7 +561,6 @@ install -d -m 755 %{buildroot}%{_localstatedir}/run/neutron
 install -p -m 644 %{SOURCE20} %{buildroot}%{_datadir}/neutron/
 install -p -m 644 %{SOURCE21} %{buildroot}%{_datadir}/neutron/
 install -p -m 644 %{SOURCE22} %{buildroot}%{_datadir}/neutron/
-install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/neutron/
 install -p -m 644 %{SOURCE24} %{buildroot}%{_datadir}/neutron/
 install -p -m 644 %{SOURCE25} %{buildroot}%{_datadir}/neutron/
 install -p -m 644 %{SOURCE26} %{buildroot}%{_datadir}/neutron/
@@ -725,26 +702,6 @@ if [ $1 -ge 1 ] ; then
 fi
 
 
-%post ryu
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /sbin/chkconfig --add neutron-ryu-agent
-fi
-
-%preun ryu
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /sbin/service neutron-ryu-agent stop >/dev/null 2>&1
-    /sbin/chkconfig --del neutron-ryu-agent
-fi
-
-%postun ryu
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /sbin/service neutron-ryu-agent condrestart >/dev/null 2>&1 || :
-fi
-
-
 %post nec
 if [ $1 -eq 1 ] ; then
     # Initial installation
@@ -905,7 +862,6 @@ fi
 %exclude %{python_sitelib}/neutron/plugins/oneconvergence
 %exclude %{python_sitelib}/neutron/plugins/openvswitch
 %exclude %{python_sitelib}/neutron/plugins/plumgrid
-%exclude %{python_sitelib}/neutron/plugins/ryu
 %exclude %{python_sitelib}/neutron/plugins/vmware
 %{python_sitelib}/neutron-%%{version}*.egg-info
 
@@ -1046,19 +1002,6 @@ fi
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/plumgrid/*.ini
 
 
-%files ryu
-%doc LICENSE
-%doc neutron/plugins/ryu/README
-%{_bindir}/neutron-ryu-agent
-#%{_bindir}/quantum-ryu-agent
-%{_initrddir}/neutron-ryu-agent
-%{_datadir}/neutron/neutron-ryu-agent.upstart
-%{python_sitelib}/neutron/plugins/ryu
-%{_datarootdir}/neutron/rootwrap/ryu-plugin.filters
-%dir %{_sysconfdir}/neutron/plugins/ryu
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ryu/*.ini
-
-
 %files nec
 %doc LICENSE
 %doc neutron/plugins/nec/README

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 7c32002504f9a5f0aa41e7b46702e19d37256c33..d123ae16c8f2ee057326ef7c2349f3443d72b994 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -27,7 +27,7 @@ install_packages() {
         #Install some plugins because they are required for db-migration scripts (bug #1371184)
         #Ubuntu neutron-server package include them
         yum install -y openstack-neutron-bigswitch openstack-neutron-brocade openstack-neutron-cisco openstack-neutron-hyperv openstack-neutron-vmware openstack-neutron-openvswitch \
-                       openstack-neutron-ryu openstack-neutron-linuxbridge openstack-neutron-metaplugin openstack-neutron-mellanox openstack-neutron-nec openstack-neutron-nuage
+                       openstack-neutron-linuxbridge openstack-neutron-metaplugin openstack-neutron-mellanox openstack-neutron-nec openstack-neutron-nuage
     fi
 }