From 2c2788fa2de7c5b7b02e4d131a9a6c88fc34fc18 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 10 Jan 2024 19:20:34 +0900 Subject: [PATCH] Drop logic for Ubuntu 14.04 ... because support for Ubuntu Trusty was removed a long ago. Change-Id: Ibab2c6e5154219c1dfbdf72326297ee5fd4fc406 --- devstack/plugin.sh | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 761bf288e8..88c9789e7c 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -746,30 +746,7 @@ function install_manila { if [[ $(sudo zfs list &> /dev/null && sudo zpool list &> /dev/null || echo 'absent') == 'absent' ]]; then # ZFS not found, try to install it if is_ubuntu; then - if [[ $(lsb_release -s -d) == *"14.04"* ]]; then - # 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 + sudo apt-get install -y zfsutils-linux else echo "Manila Devstack plugin supports installation "\ "of ZFS packages only for 'Ubuntu' distros. "\