MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: rename openvswitch-controller

Browse Source 
As of version 2.4.0 openvswitch-controller has been renamed to
openvswitch-testcontroller. This was documented in the upstream 'NEWS':

   - test-controller has been renamed ovs-testcontroller at request of users
     who find it useful for testing basic OpenFlow setups.  It is still not
     a necessary or desirable part of most Open vSwitch deployments.

Our initscripts and such have continued to reference the old name
despite the application name name changing and so
openvswitch-controller packaging has been broken for some time now.

We rename the openvswitch-controller package to reflect the upstream
name change and apply  this name change throughout. We also drop the
RDEPENDS as the upstream comments also indicate that this package is
not needed for a normal openvswitch deployment.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Mark Asselstine 2015-12-11 12:28:24 -05:00 committed by Bruce Ashfield
parent 9772ddbec3
commit 5181ec2259
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
recipes-networking/openvswitch/files/openvswitch-controller → recipes-networking/openvswitch/files/openvswitch-testcontroller
View File

@ -19,7 +19,7 @@
# Suite 330, Boston, MA 02111-1307 USA # Suite 330, Boston, MA 02111-1307 USA
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: openvswitch-controller # Provides: openvswitch-testcontroller
# Required-Start: $network $local_fs $remote_fs # Required-Start: $network $local_fs $remote_fs
# Required-Stop: $remote_fs # Required-Stop: $remote_fs
# Should-Start: $named # Should-Start: $named
@ -31,9 +31,9 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/bin/ovs-controller # Introduce the server's location here DAEMON=/usr/bin/ovs-testcontroller # Introduce the server's location here
NAME=ovs-controller # Introduce the short server's name here NAME=ovs-testcontroller # Introduce the short server's name here
DESC=ovs-controller # Introduce a short description here DESC=ovs-testcontroller # Introduce a short description here
LOGDIR=/var/log/openvswitch # Log directory to use LOGDIR=/var/log/openvswitch # Log directory to use
PIDFILE=/var/run/openvswitch/$NAME.pid PIDFILE=/var/run/openvswitch/$NAME.pid
@ -43,7 +43,7 @@ test -x $DAEMON || exit 0
. /lib/lsb/init-functions . /lib/lsb/init-functions
# Default options, these can be overriden by the information # Default options, these can be overriden by the information
# at /etc/default/openvswitch-controller # at /etc/default/openvswitch-testcontroller
DAEMON_OPTS="" # Additional options given to the server DAEMON_OPTS="" # Additional options given to the server
DODTIME=10 # Time to wait for the server to die, in seconds DODTIME=10 # Time to wait for the server to die, in seconds
@ -56,7 +56,7 @@ LOGFILE=$LOGDIR/$NAME.log # Server logfile
# is set start-stop-daemon will chuid the server # is set start-stop-daemon will chuid the server
# Include defaults if available # Include defaults if available
default=/etc/default/openvswitch-controller default=/etc/default/openvswitch-testcontroller
if [ -f $default ] ; then if [ -f $default ] ; then
. $default . $default
fi fi
@ -113,9 +113,9 @@ start_server() {
SSL_OPTS= SSL_OPTS=
case $LISTEN in case $LISTEN in
*ssl*) *ssl*)
: ${PRIVKEY:=/etc/openvswitch-controller/privkey.pem} : ${PRIVKEY:=/etc/openvswitch-testcontroller/privkey.pem}
: ${CERT:=/etc/openvswitch-controller/cert.pem} : ${CERT:=/etc/openvswitch-testcontroller/cert.pem}
: ${CACERT:=/etc/openvswitch-controller/cacert.pem} : ${CACERT:=/etc/openvswitch-testcontroller/cacert.pem}
if test ! -e "$PRIVKEY" || test ! -e "$CERT" || if test ! -e "$PRIVKEY" || test ! -e "$CERT" ||
test ! -e "$CACERT"; then test ! -e "$CACERT"; then
if test ! -e "$PRIVKEY"; then if test ! -e "$PRIVKEY"; then
@ -265,7 +265,7 @@ case "$1" in
log_warning_msg "cannot re-read the config file (use restart)." log_warning_msg "cannot re-read the config file (use restart)."
;; ;;
*) *)
N=/etc/init.d/openvswitch-controller N=/etc/init.d/openvswitch-testcontroller
echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2 echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
exit 1 exit 1
;; ;;

6
recipes-networking/openvswitch/files/openvswitch-controller-setup → recipes-networking/openvswitch/files/openvswitch-testcontroller-setup
View File

@ -15,15 +15,15 @@ LISTEN="pssl:"
# PRIVKEY: Name of file containing controller's private key. # PRIVKEY: Name of file containing controller's private key.
# Required if SSL enabled. # Required if SSL enabled.
PRIVKEY=/etc/openvswitch-controller/privkey.pem PRIVKEY=/etc/openvswitch-testcontroller/privkey.pem
# CERT: Name of file containing certificate for private key. # CERT: Name of file containing certificate for private key.
# Required if SSL enabled. # Required if SSL enabled.
CERT=/etc/openvswitch-controller/cert.pem CERT=/etc/openvswitch-testcontroller/cert.pem
# CACERT: Name of file containing switch CA certificate. # CACERT: Name of file containing switch CA certificate.
# Required if SSL enabled. # Required if SSL enabled.
CACERT=/etc/openvswitch-controller/cacert.pem CACERT=/etc/openvswitch-testcontroller/cacert.pem
# Additional options to pass to controller, e.g. "--hub" # Additional options to pass to controller, e.g. "--hub"
DAEMON_OPTS="" DAEMON_OPTS=""

36
recipes-networking/openvswitch/openvswitch.inc
View File

@ -14,9 +14,9 @@ LICENSE = "Apache-2"
DEPENDS += "bridge-utils openssl python perl" DEPENDS += "bridge-utils openssl python perl"
RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \
python perl perl-module-strict ${PN}-switch ${PN}-controller \ python perl perl-module-strict ${PN}-switch \
bash" bash"
RDEPENDS_${PN}-controller = "${PN} lsb ${PN}-pki" RDEPENDS_${PN}-testcontroller = "${PN} lsb ${PN}-pki"
RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen"
RDEPENDS_${PN}-pki = "${PN}" RDEPENDS_${PN}-pki = "${PN}"
RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"
@ -29,8 +29,8 @@ RDEPENDS_${PN} += "sed gawk grep"
SRC_URI = "\ SRC_URI = "\
file://openvswitch-switch \ file://openvswitch-switch \
file://openvswitch-switch-setup \ file://openvswitch-switch-setup \
file://openvswitch-controller \ file://openvswitch-testcontroller \
file://openvswitch-controller-setup \ file://openvswitch-testcontroller-setup \
file://openvswitch-add-target-python-handling.patch \ file://openvswitch-add-target-python-handling.patch \
file://openvswitch-add-target-perl-handling.patch \ file://openvswitch-add-target-perl-handling.patch \
" "
@ -47,13 +47,13 @@ CONFIGUREOPT_DEPTRACK = ""
# EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" # EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}"
ALLOW_EMPTY_${PN}-pki = "1" ALLOW_EMPTY_${PN}-pki = "1"
PACKAGES =+ "${PN}-controller ${PN}-switch ${PN}-brcompat ${PN}-pki" PACKAGES =+ "${PN}-testcontroller ${PN}-switch ${PN}-brcompat ${PN}-pki"
FILES_${PN}-controller = "\ FILES_${PN}-testcontroller = "\
${sysconfdir}/init.d/openvswitch-controller \ ${sysconfdir}/init.d/openvswitch-testcontroller \
${sysconfdir}/default/openvswitch-controller \ ${sysconfdir}/default/openvswitch-testcontroller \
${sysconfdir}/openvswitch-controller \ ${sysconfdir}/openvswitch-testcontroller \
${bindir}/ovs-controller \ ${bindir}/ovs-testcontroller \
" "
FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd"
@ -69,21 +69,21 @@ FILES_${PN} += "/run"
inherit autotools update-rc.d inherit autotools update-rc.d
INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-controller" INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller"
INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch" INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch"
INITSCRIPT_PARAMS_${PN}-switch = "defaults 71" INITSCRIPT_PARAMS_${PN}-switch = "defaults 71"
INITSCRIPT_NAME_${PN}-controller = "openvswitch-controller" INITSCRIPT_NAME_${PN}-testcontroller = "openvswitch-testcontroller"
INITSCRIPT_PARAMS_${PN}-controller = "defaults 72" INITSCRIPT_PARAMS_${PN}-testcontroller = "defaults 72"
do_install_append() { do_install_append() {
install -d ${D}/${sysconfdir}/default/ install -d ${D}/${sysconfdir}/default/
install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
install -d ${D}/${sysconfdir}/openvswitch-controller install -d ${D}/${sysconfdir}/openvswitch-testcontroller
install -m 660 ${WORKDIR}/openvswitch-controller-setup ${D}/${sysconfdir}/default/openvswitch-controller install -m 660 ${WORKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
install -d ${D}/${sysconfdir}/init.d/ install -d ${D}/${sysconfdir}/init.d/
install -m 755 ${WORKDIR}/openvswitch-controller ${D}/${sysconfdir}/init.d/openvswitch-controller install -m 755 ${WORKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
true || rm -fr ${D}/${datadir}/${PN}/pki true || rm -fr ${D}/${datadir}/${PN}/pki
@ -102,7 +102,7 @@ pkg_postinst_${PN}-pki () {
fi fi
} }
pkg_postinst_${PN}-controller () { pkg_postinst_${PN}-testcontroller () {
# can't do this offline # can't do this offline
if [ "x$D" != "x" ]; then if [ "x$D" != "x" ]; then
exit 1 exit 1
@ -112,7 +112,7 @@ pkg_postinst_${PN}-controller () {
ovs-pki init --dir=$D/${datadir}/${PN}/pki ovs-pki init --dir=$D/${datadir}/${PN}/pki
fi fi
cd $D/${sysconfdir}/openvswitch-controller cd $D/${sysconfdir}/openvswitch-testcontroller
if ! test -e cacert.pem; then if ! test -e cacert.pem; then
ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem
fi fi