Remove support for opensuse
We haven't been testing the distro for a while in CI, e.g. in
Tempest, the jobs on opensuse15 haven't been executed for a year
now.
Therefore the patch removes opensuse support from devstack.
Closes-Bug: #2002900
Change-Id: I0f5e4c644e2d14d1b8bb5bc0096d1469febe5fcc
diff --git a/lib/apache b/lib/apache
index dd8c9a0..4d68b49 100644
--- a/lib/apache
+++ b/lib/apache
@@ -44,10 +44,6 @@
APACHE_NAME=httpd
APACHE_CONF_DIR=${APACHE_CONF_DIR:-/etc/$APACHE_NAME/conf.d}
APACHE_SETTINGS_DIR=${APACHE_SETTINGS_DIR:-/etc/$APACHE_NAME/conf.d}
-elif is_suse; then
- APACHE_NAME=apache2
- APACHE_CONF_DIR=${APACHE_CONF_DIR:-/etc/$APACHE_NAME/vhosts.d}
- APACHE_SETTINGS_DIR=${APACHE_SETTINGS_DIR:-/etc/$APACHE_NAME/conf.d}
fi
APACHE_LOG_DIR="/var/log/${APACHE_NAME}"
@@ -65,11 +61,6 @@
sudo a2enmod $mod
restart_apache_server
fi
- elif is_suse; then
- if ! a2enmod -q $mod ; then
- sudo a2enmod $mod
- restart_apache_server
- fi
elif is_fedora; then
# pass
true
@@ -104,10 +95,6 @@
# Thus there is nothing else to do after this install
install_package uwsgi \
uwsgi-plugin-python3
- elif [[ $os_VENDOR =~ openSUSE ]]; then
- install_package uwsgi \
- uwsgi-python3 \
- apache2-mod_uwsgi
else
# Compile uwsgi from source.
local dir
@@ -125,7 +112,7 @@
sudo rm -rf $dir
fi
- if is_ubuntu || is_suse ; then
+ if is_ubuntu; then
# we've got to enable proxy and proxy_uwsgi for this to work
sudo a2enmod proxy
sudo a2enmod proxy_uwsgi
@@ -155,8 +142,6 @@
sudo sed -i '/mod_mpm_prefork.so/s/^/#/g' /etc/httpd/conf.modules.d/00-mpm.conf
sudo sed -i '/mod_mpm_event.so/s/^/#/g' /etc/httpd/conf.modules.d/00-mpm.conf
sudo sed -i '/mod_mpm_worker.so/s/^#//g' /etc/httpd/conf.modules.d/00-mpm.conf
- elif is_suse; then
- install_package apache2 apache2-mod_wsgi
else
exit_distro_not_supported "apache wsgi installation"
fi
@@ -171,7 +156,7 @@
# recognise it. a2ensite and a2dissite ignore the .conf suffix used as parameter. The default sites'
# files are 000-default.conf and default-ssl.conf.
#
-# On Fedora and openSUSE, any file in /etc/httpd/conf.d/ whose name ends with .conf is enabled.
+# On Fedora, any file in /etc/httpd/conf.d/ whose name ends with .conf is enabled.
#
# On RHEL and CentOS, things should hopefully work as in Fedora.
#
@@ -187,7 +172,7 @@
if is_ubuntu; then
# Ubuntu 14.04 - Apache 2.4
echo $APACHE_CONF_DIR/${site}.conf
- elif is_fedora || is_suse; then
+ elif is_fedora; then
# fedora conf.d is only imported if it ends with .conf so this is approx the same
local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
if [ -f $enabled_site_file ]; then
@@ -205,7 +190,7 @@
enable_apache_mod version
if is_ubuntu; then
sudo a2ensite ${site}
- elif is_fedora || is_suse; then
+ elif is_fedora; then
local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
# Do nothing if site already enabled or no site config exists
if [[ -f ${enabled_site_file}.disabled ]] && [[ ! -f ${enabled_site_file} ]]; then
@@ -219,7 +204,7 @@
local site=$@
if is_ubuntu; then
sudo a2dissite ${site} || true
- elif is_fedora || is_suse; then
+ elif is_fedora; then
local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
# Do nothing if no site config exists
if [[ -f ${enabled_site_file} ]]; then
diff --git a/lib/cinder b/lib/cinder
index 2424f92..602e8da 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -117,8 +117,8 @@
fi
-# EL and SUSE should only use lioadm
-if is_fedora || is_suse; then
+# EL should only use lioadm
+if is_fedora; then
if [[ ${CINDER_TARGET_HELPER} != "lioadm" && ${CINDER_TARGET_HELPER} != 'nvmet' ]]; then
die "lioadm and nvmet are the only valid Cinder target_helper config on this platform"
fi
@@ -595,11 +595,6 @@
_configure_tgt_for_config_d
if is_ubuntu; then
sudo service tgt restart
- elif is_suse; then
- # NOTE(dmllr): workaround restart bug
- # https://bugzilla.suse.com/show_bug.cgi?id=934642
- stop_service tgtd
- start_service tgtd
else
restart_service tgtd
fi
diff --git a/lib/databases/mysql b/lib/databases/mysql
index fbad44e..ed8006e 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -20,12 +20,6 @@
MYSQL_SERVICE_NAME=mysql
if is_fedora && ! is_oraclelinux; then
MYSQL_SERVICE_NAME=mariadb
- elif is_suse && systemctl list-unit-files | grep -q 'mariadb\.service'; then
- # Older mariadb packages on SLES 12 provided mysql.service. The
- # newer ones on SLES 12 and 15 use mariadb.service; they also
- # provide a mysql.service symlink for backwards-compatibility, but
- # let's not rely on that.
- MYSQL_SERVICE_NAME=mariadb
elif [[ "$DISTRO" == "bullseye" ]]; then
MYSQL_SERVICE_NAME=mariadb
fi
@@ -54,7 +48,7 @@
elif is_oraclelinux; then
uninstall_package mysql-community-server
sudo rm -rf /var/lib/mysql
- elif is_suse || is_fedora; then
+ elif is_fedora; then
uninstall_package mariadb-server
sudo rm -rf /var/lib/mysql
else
@@ -74,7 +68,7 @@
if is_ubuntu; then
my_conf=/etc/mysql/my.cnf
- elif is_suse || is_oraclelinux; then
+ elif is_oraclelinux; then
my_conf=/etc/my.cnf
elif is_fedora; then
my_conf=/etc/my.cnf
@@ -90,7 +84,7 @@
iniset -sudo $my_conf mysqld bind-address "$(ipv6_unquote $SERVICE_LISTEN_ADDRESS)"
# (Re)Start mysql-server
- if is_fedora || is_suse; then
+ if is_fedora; then
# service is not started by default
start_service $MYSQL_SERVICE_NAME
elif is_ubuntu; then
@@ -212,9 +206,6 @@
elif is_fedora; then
install_package mariadb-server mariadb-devel mariadb
sudo systemctl enable $MYSQL_SERVICE_NAME
- elif is_suse; then
- install_package mariadb-server
- sudo systemctl enable $MYSQL_SERVICE_NAME
elif is_ubuntu; then
install_package $MYSQL_SERVICE_NAME-server
else
diff --git a/lib/databases/postgresql b/lib/databases/postgresql
index 4f0a5a0..b21418b 100644
--- a/lib/databases/postgresql
+++ b/lib/databases/postgresql
@@ -32,7 +32,7 @@
# Get ruthless with mysql
apt_get purge -y postgresql*
return
- elif is_fedora || is_suse; then
+ elif is_fedora; then
uninstall_package postgresql-server
else
return
@@ -66,11 +66,6 @@
pg_dir=`find /etc/postgresql -name pg_hba.conf|xargs dirname`
pg_hba=$pg_dir/pg_hba.conf
pg_conf=$pg_dir/postgresql.conf
- elif is_suse; then
- pg_hba=/var/lib/pgsql/data/pg_hba.conf
- pg_conf=/var/lib/pgsql/data/postgresql.conf
- # initdb is called when postgresql is first started
- sudo [ -e $pg_hba ] || start_service postgresql
else
exit_distro_not_supported "postgresql configuration"
fi
@@ -107,7 +102,7 @@
if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then
if is_ubuntu; then
install_package postgresql
- elif is_fedora || is_suse; then
+ elif is_fedora; then
install_package postgresql-server
if is_fedora; then
sudo systemctl enable postgresql
diff --git a/lib/glance b/lib/glance
index 041acaf..5aeae16 100644
--- a/lib/glance
+++ b/lib/glance
@@ -47,10 +47,6 @@
# from CINDER_ENABLED_BACKENDS
GLANCE_CINDER_DEFAULT_BACKEND=${GLANCE_CINDER_DEFAULT_BACKEND:-lvmdriver-1}
GLANCE_STORE_ROOTWRAP_BASE_DIR=/usr/local/etc/glance
-# NOTE (abhishekk): For opensuse data files are stored in different directory
-if is_opensuse; then
- GLANCE_STORE_ROOTWRAP_BASE_DIR=/usr/etc/glance
-fi
# When Cinder is used as a glance store, you can optionally configure cinder to
# optimize bootable volume creation by allowing volumes to be cloned directly
# in the backend instead of transferring data via Glance. To use this feature,
diff --git a/lib/horizon b/lib/horizon
index b2bf7bc..f76f9e5 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -129,7 +129,7 @@
if is_ubuntu; then
disable_apache_site 000-default
sudo touch $horizon_conf
- elif is_fedora || is_suse; then
+ elif is_fedora; then
: # nothing to do
else
exit_distro_not_supported "horizon apache configuration"
diff --git a/lib/ldap b/lib/ldap
index ea5faa1..b0195db 100644
--- a/lib/ldap
+++ b/lib/ldap
@@ -39,13 +39,6 @@
LDAP_OLCDB_NUMBER=2
LDAP_OLCDB_TYPE=hdb
LDAP_ROOTPW_COMMAND=add
-elif is_suse; then
- # SUSE has slappasswd in /usr/sbin/
- PATH=$PATH:/usr/sbin/
- LDAP_OLCDB_NUMBER=1
- LDAP_OLCDB_TYPE=hdb
- LDAP_ROOTPW_COMMAND=add
- LDAP_SERVICE_NAME=ldap
fi
@@ -76,8 +69,6 @@
sudo rm -rf /etc/ldap/ldap.conf /var/lib/ldap
elif is_fedora; then
sudo rm -rf /etc/openldap /var/lib/ldap
- elif is_suse; then
- sudo rm -rf /var/lib/ldap
fi
}
@@ -126,11 +117,6 @@
configure_ldap
elif is_fedora; then
start_ldap
- elif is_suse; then
- _ldap_varsubst $FILES/ldap/suse-base-config.ldif.in >$tmp_ldap_dir/suse-base-config.ldif
- sudo slapadd -F /etc/openldap/slapd.d/ -bcn=config -l $tmp_ldap_dir/suse-base-config.ldif
- sudo sed -i '/^OPENLDAP_START_LDAPI=/s/"no"/"yes"/g' /etc/sysconfig/openldap
- start_ldap
fi
echo "LDAP_PASSWORD is $LDAP_PASSWORD"
diff --git a/lib/lvm b/lib/lvm
index 57ffb96..57d2cd4 100644
--- a/lib/lvm
+++ b/lib/lvm
@@ -129,8 +129,8 @@
local vg=$1
local size=$2
- # Start the tgtd service on Fedora and SUSE if tgtadm is used
- if is_fedora || is_suse && [[ "$CINDER_TARGET_HELPER" = "tgtadm" ]]; then
+ # Start the tgtd service on Fedora if tgtadm is used
+ if is_fedora; then
start_service tgtd
fi
diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index cc41a8c..adabc56 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -80,19 +80,6 @@
elif is_fedora; then
restart_service openvswitch
sudo systemctl enable openvswitch
- elif is_suse; then
- if [[ $DISTRO == "sle12" ]] && vercmp "$os_RELEASE" "<" "12.2" ; then
- restart_service openvswitch-switch
- else
- # workaround for https://bugzilla.suse.com/show_bug.cgi?id=1085971
- if [[ $DISTRO =~ "tumbleweed" ]]; then
- sudo sed -i -e "s,^OVS_USER_ID=.*,OVS_USER_ID='root:root'," /etc/sysconfig/openvswitch
- fi
- restart_service openvswitch || {
- journalctl -xe || :
- systemctl status openvswitch
- }
- fi
fi
fi
}
diff --git a/lib/neutron_plugins/ovs_source b/lib/neutron_plugins/ovs_source
index ea71e60..288eb1d 100644
--- a/lib/neutron_plugins/ovs_source
+++ b/lib/neutron_plugins/ovs_source
@@ -182,12 +182,6 @@
${action}_service openvswitch-switch
elif is_fedora; then
${action}_service openvswitch
- elif is_suse; then
- if [[ $DISTRO == "sle12" ]] && [[ $os_RELEASE -lt 12.2 ]]; then
- ${action}_service openvswitch-switch
- else
- ${action}_service openvswitch
- fi
fi
}
diff --git a/lib/nova b/lib/nova
index 3aa6b9e..f34e823 100644
--- a/lib/nova
+++ b/lib/nova
@@ -448,8 +448,8 @@
iniset $NOVA_CONF key_manager backend nova.keymgr.conf_key_mgr.ConfKeyManager
- if is_fedora || is_suse; then
- # nova defaults to /usr/local/bin, but fedora and suse pip like to
+ if is_fedora; then
+ # nova defaults to /usr/local/bin, but fedora pip like to
# install things in /usr/bin
iniset $NOVA_CONF DEFAULT bindir "/usr/bin"
fi
@@ -523,7 +523,7 @@
# nova defaults to genisoimage but only mkisofs is available for 15.0+
# rhel provides mkisofs symlink to genisoimage or xorriso appropiately
- if is_suse || is_fedora; then
+ if is_fedora; then
iniset $NOVA_CONF DEFAULT mkisofs_cmd /usr/bin/mkisofs
fi
diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index c0e45eb..7992306 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -74,7 +74,7 @@
install_package qemu-efi
fi
#pip_install_gr <there-si-no-guestfs-in-pypi>
- elif is_fedora || is_suse; then
+ elif is_fedora; then
# Optionally enable the virt-preview repo when on Fedora
if [[ $DISTRO =~ f[0-9][0-9] ]] && [[ ${ENABLE_FEDORA_VIRT_PREVIEW_REPO} == "True" ]]; then
@@ -121,8 +121,8 @@
EOF
fi
- if is_fedora || is_suse; then
- # Starting with fedora 18 and opensuse-12.3 enable stack-user to
+ if is_fedora; then
+ # Starting with fedora 18 enable stack-user to
# virsh -c qemu:///system by creating a policy-kit rule for
# stack-user using the new Javascript syntax
rules_dir=/etc/polkit-1/rules.d
diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index c1cd132..87c3d3a 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -114,9 +114,6 @@
sudo dpkg-statoverride --add --update $STAT_OVERRIDE
fi
done
- elif is_suse; then
- # Workaround for missing dependencies in python-libguestfs
- install_package python-libguestfs guestfs-data augeas augeas-lenses
elif is_fedora; then
install_package python3-libguestfs
fi
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 743b4ae..bbb4149 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -52,20 +52,7 @@
if is_service_enabled rabbit; then
# Install rabbitmq-server
install_package rabbitmq-server
- if is_suse; then
- install_package rabbitmq-server-plugins
- # the default systemd socket activation only listens on the loopback interface
- # which causes rabbitmq to try to start its own epmd
- sudo mkdir -p /etc/systemd/system/epmd.socket.d
- cat <<EOF | sudo tee /etc/systemd/system/epmd.socket.d/ports.conf >/dev/null
-[Socket]
-ListenStream=
-ListenStream=[::]:4369
-EOF
- sudo systemctl daemon-reload
- sudo systemctl restart epmd.socket epmd.service
- fi
- if is_fedora || is_suse; then
+ if is_fedora; then
# NOTE(jangutter): If rabbitmq is not running (as in a fresh
# install) then rabbit_setuser triggers epmd@0.0.0.0.socket with
# socket activation. This fails the first time and does not get
diff --git a/lib/swift b/lib/swift
index 251c462..1ebf073 100644
--- a/lib/swift
+++ b/lib/swift
@@ -547,9 +547,6 @@
local swift_log_dir=${SWIFT_DATA_DIR}/logs
sudo rm -rf ${swift_log_dir}
local swift_log_group=adm
- if is_suse; then
- swift_log_group=root
- fi
sudo install -d -o ${STACK_USER} -g ${swift_log_group} ${swift_log_dir}/hourly
if [[ $SYSLOG != "False" ]]; then
diff --git a/lib/tls b/lib/tls
index b8758cd..e0c7500 100644
--- a/lib/tls
+++ b/lib/tls
@@ -212,9 +212,6 @@
if is_fedora; then
sudo cp $INT_CA_DIR/ca-chain.pem /usr/share/pki/ca-trust-source/anchors/devstack-chain.pem
sudo update-ca-trust
- elif is_suse; then
- sudo cp $INT_CA_DIR/ca-chain.pem /usr/share/pki/trust/anchors/devstack-chain.pem
- sudo update-ca-certificates
elif is_ubuntu; then
sudo cp $INT_CA_DIR/ca-chain.pem /usr/local/share/ca-certificates/devstack-int.crt
sudo cp $ROOT_CA_DIR/cacert.pem /usr/local/share/ca-certificates/devstack-root.crt
@@ -376,9 +373,6 @@
elif is_ubuntu; then
sudo rm -f $capath
sudo ln -s /etc/ssl/certs/ca-certificates.crt $capath
- elif is_suse; then
- sudo rm -f $capath
- sudo ln -s /etc/ssl/ca-bundle.pem $capath
else
echo "Don't know how to set the CA bundle, expect the install to fail."
fi
@@ -441,9 +435,6 @@
if is_ubuntu; then
sudo a2enmod ssl
- elif is_suse; then
- sudo a2enmod ssl
- sudo a2enflag SSL
elif is_fedora; then
# Fedora enables mod_ssl by default
:
@@ -560,9 +551,6 @@
CustomLog $APACHE_LOG_DIR/tls-proxy_access.log combined
</VirtualHost>
EOF
- if is_suse ; then
- sudo a2enflag SSL
- fi
for mod in headers ssl proxy proxy_http; do
enable_apache_mod $mod
done