openstack
/
manila
Code Issues Proposed changes

Drop logic for Ubuntu 14.04 

... because support for Ubuntu Trusty was removed a long ago.

Change-Id: Ibab2c6e5154219c1dfbdf72326297ee5fd4fc406
This commit is contained in:
Takashi Kajinami 2024-01-10 19:20:34 +09:00
parent 0ca4caae7b
commit 2c2788fa2d
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
devstack/plugin.sh
View File

@ -746,30 +746,7 @@ function install_manila {
if [[ $(sudo zfs list &> /dev/null && sudo zpool list &> /dev/null || echo 'absent') == 'absent' ]]; then if [[ $(sudo zfs list &> /dev/null && sudo zpool list &> /dev/null || echo 'absent') == 'absent' ]]; then
# ZFS not found, try to install it # ZFS not found, try to install it
if is_ubuntu; then if is_ubuntu; then
if [[ $(lsb_release -s -d) == *"14.04"* ]]; then sudo apt-get install -y zfsutils-linux
# Trusty
sudo apt-get install -y software-properties-common
sudo apt-add-repository --yes ppa:zfs-native/stable
# Workaround for bug #1609696
sudo apt-mark hold grub*
sudo apt-get -y -q update && sudo apt-get -y -q upgrade
# Workaround for bug #1609696
sudo apt-mark unhold grub*
sudo apt-get install -y linux-headers-generic
sudo apt-get install -y build-essential
sudo apt-get install -y ubuntu-zfs
elif [[ $(echo $(lsb_release -rs) '>=' 16.04 | bc -l) == 1 ]]; then
# Xenial and beyond
sudo apt-get install -y zfsutils-linux
else
echo "Only 'Trusty', 'Xenial' and newer releases of Ubuntu are supported."
exit 1
fi
else else
echo "Manila Devstack plugin supports installation "\ echo "Manila Devstack plugin supports installation "\
"of ZFS packages only for 'Ubuntu' distros. "\ "of ZFS packages only for 'Ubuntu' distros. "\