Browse Source
Revert "Initial DPDK support"
This reverts commit ce5e82e319.
MicroStack cannot currently install due to a missing ovs-related
library. This is possibly due to recent changes in spacraft, or
possibly due to the workarounds for those changes. Regardless, it
appears that backing out the DPDK changes gets us back to a state
where we can install.
Partial-Bug: 1862911
Change-Id: I060c1a0095470639f9158cb9e9ebe8281a65a678
changes/48/707448/2
Pete Vander Giessen
1 year ago
11 changed files with 57 additions and 398 deletions
Split View
Diff Options
-
+0 -1snap-overlay/bin/set-default-config
-
+3 -5snap-overlay/bin/setup-br-ex
-
+0 -70snap-wrappers/ovs/ovs-alternatives
-
+4 -30snap-wrappers/ovs/ovs-wrapper
-
+0 -3snap/hooks/configure
-
+0 -3snap/hooks/install
-
+0 -5snap/hooks/remove
-
+2 -133snapcraft.yaml
-
+45 -82tools/init/init/questions/__init__.py
-
+1 -61tools/init/init/questions/network.py
-
+2 -5tools/init/init/shell.py
+ 0
- 1
snap-overlay/bin/set-default-config
View File
+ 3
- 5
snap-overlay/bin/setup-br-ex
View File
+ 0
- 70
snap-wrappers/ovs/ovs-alternatives
View File
| @ -1,70 +0,0 @@ | |||
| #!/bin/bash | |||
| # this initializes the ovs commands alternatives with the default non-dpdk binaries | |||
| set -e | |||
| function _remove(){ | |||
| #remove both openvswitch and openvswitch-dpdk alternatives of the current release. | |||
| # it is called at post-refresh hook time and at remove hook time also. | |||
| for version in openvswitch openvswitch-dpdk; do | |||
| for dir in \ | |||
| bin \ | |||
| etc/init.d \ | |||
| sbin \ | |||
| share/openvswitch/scripts \ | |||
| usr/bin \ | |||
| var/snap/${SNAP_NAME}/etc/bash_completion.d \ | |||
| ; do | |||
| cd ${SNAP}/${version}/${dir}/ | |||
| for file in *; do | |||
| update-alternatives --quiet --remove ${file} ${SNAP}/${version}/${dir}/${file} | |||
| done | |||
| cd - &>/dev/null | |||
| done | |||
| done | |||
| } | |||
| function _install(){ | |||
| # only set version alternatives when it is configured via snap config options | |||
| version="openvswitch" | |||
| if [[ $(snapctl get config.network.ovs-dpdk) == *"rue" ]]; then | |||
| version="openvswitch-dpdk" | |||
| fi | |||
| for dir in \ | |||
| bin \ | |||
| etc/init.d \ | |||
| sbin \ | |||
| share/openvswitch/scripts \ | |||
| usr/bin \ | |||
| var/snap/${SNAP_NAME}/etc/bash_completion.d \ | |||
| ; do | |||
| cd ${SNAP}/${version}/${dir}/ | |||
| mkdir -p ${SNAP_COMMON}/${dir}/ | |||
| for file in *; do | |||
| update-alternatives --quiet --install $SNAP_COMMON/$dir/${file} ${file} ${SNAP}/${version}/${dir}/${file} 1 | |||
| update-alternatives --quiet --set ${file} ${SNAP}/${version}/${dir}/${file} | |||
| done | |||
| cd - &>/dev/null | |||
| done | |||
| } | |||
| while [[ $# -gt 0 ]] | |||
| do | |||
| key="$1" | |||
| case $key in | |||
| -i|--install) | |||
| shift # past argument | |||
| _install | |||
| ;; | |||
| -r|--remove) | |||
| shift # past argument | |||
| _remove | |||
| ;; | |||
| *) # unknown option, noop | |||
| shift # past argument | |||
| ;; | |||
| esac | |||
| done | |||
| exit 0 | |||
+ 4
- 30
snap-wrappers/ovs/ovs-wrapper
View File
| @ -1,42 +1,16 @@ | |||
| #!/bin/bash | |||
| # important: not to echo or print anything on stdout, will be taken into ovs-ctl | |||
| set -e | |||
| export OVS_LOGDIR=${SNAP_COMMON}/log/openvswitch | |||
| export OVS_RUNDIR=${SNAP_COMMON}/run/openvswitch | |||
| export OVS_SYSCONFDIR=${SNAP_COMMON}/etc | |||
| export OVS_PKGDATADIR=${SNAP}/openvswitch-dpdk/share/openvswitch | |||
| if [ "$(snapctl get config.network.ovs-dpdk)" == "false" ]; then | |||
| export OVS_BINDIR=${SNAP}/openvswitch/bin | |||
| export OVS_SBINDIR=${SNAP}/openvswitch/sbin | |||
| export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${SNAP}/openvswitch/lib:${SNAP}/openvswitch/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}" | |||
| else | |||
| export OVS_BINDIR=${SNAP}/openvswitch-dpdk/bin | |||
| export OVS_SBINDIR=${SNAP}/openvswitch-dpdk/sbin | |||
| export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${SNAP}/openvswitch-dpdk/lib:${SNAP}/openvswitch-dpdk/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}" | |||
| fi | |||
| export OVS_PKGDATADIR=${SNAP}/share/openvswitch | |||
| export OVS_BINDIR=${SNAP}/bin | |||
| export OVS_SBINDIR=${SNAP}/sbin | |||
| mkdir -p ${OVS_LOGDIR} | |||
| mkdir -p ${OVS_RUNDIR} | |||
| mkdir -p ${OVS_SYSCONFDIR}/openvswitch | |||
| # need to maintain ovsdb-server and ovs-vswtichd unix socket path: | |||
| shopt -s nullglob | |||
| for ctl in $OVS_RUNDIR/*.real.*.ctl; | |||
| do | |||
| ln -fs $ctl "${ctl//.real/}" | |||
| done | |||
| # needs further testing: vvv | |||
| #echo "find $OVS_RUNDIR/*.ctl -xtype l -delete" | |||
| shopt -u nullglob | |||
| if [[ "$0" == *"ovs-wrapper"* ]]; then | |||
| cmd=$(command -v ${1}) | |||
| exec ${cmd%/*}/real/${cmd##*/} "${@:2}" | |||
| else | |||
| # command is symlink to this script | |||
| exec "${0%/*}/real/${0##*/}" "${@}" | |||
| fi | |||
| exec $@ | |||
+ 0
- 3
snap/hooks/configure
View File
| @ -1,9 +1,6 @@ | |||
| #!/bin/bash | |||
| set -ex | |||
| # update the openvswitch binaries alternatives if needed | |||
| ${SNAP}/bin/ovs-alternatives --install | |||
| snap-openstack setup # Write out templates | |||
| source $SNAP_COMMON/etc/microstack.rc | |||
+ 0
- 3
snap/hooks/install
View File
+ 0
- 5
snap/hooks/remove
View File
| @ -1,5 +0,0 @@ | |||
| #!/bin/bash | |||
| set -ex | |||
| # cleanup openvswitch binaries alternatives | |||
| ${SNAP}/bin/ovs-alternatives --remove | |||