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
This commit is contained in:
		| @@ -38,8 +38,7 @@ Install Linux | |||||||
|  |  | ||||||
| Start with a clean and minimal install of a Linux system. DevStack | Start with a clean and minimal install of a Linux system. DevStack | ||||||
| attempts to support the two latest LTS releases of Ubuntu, the | attempts to support the two latest LTS releases of Ubuntu, the | ||||||
| latest/current Fedora version, CentOS/RHEL/Rocky Linux 9, OpenSUSE and | latest/current Fedora version, CentOS/RHEL/Rocky Linux 9 and openEuler. | ||||||
| openEuler. |  | ||||||
|  |  | ||||||
| If you do not have a preference, Ubuntu 22.04 (Jammy) is the | If you do not have a preference, Ubuntu 22.04 (Jammy) is the | ||||||
| most tested, and will probably go the smoothest. | most tested, and will probably go the smoothest. | ||||||
|   | |||||||
| @@ -243,9 +243,6 @@ locations in the top-level of the plugin repository: | |||||||
| - ``./devstack/files/rpms/$plugin_name`` - Packages to install when running | - ``./devstack/files/rpms/$plugin_name`` - Packages to install when running | ||||||
|   on Red Hat, Fedora, or CentOS. |   on Red Hat, Fedora, or CentOS. | ||||||
|  |  | ||||||
| - ``./devstack/files/rpms-suse/$plugin_name`` - Packages to install when |  | ||||||
|   running on SUSE Linux or openSUSE. |  | ||||||
|  |  | ||||||
| Although there a no plans to remove this method of installing | Although there a no plans to remove this method of installing | ||||||
| packages, plugins should consider it deprecated for ``bindep`` support | packages, plugins should consider it deprecated for ``bindep`` support | ||||||
| described below. | described below. | ||||||
|   | |||||||
| @@ -1 +0,0 @@ | |||||||
| dnsmasq |  | ||||||
| @@ -1,3 +0,0 @@ | |||||||
| ceph    # NOPRIME |  | ||||||
| lsb |  | ||||||
| xfsprogs |  | ||||||
| @@ -1,3 +0,0 @@ | |||||||
| lvm2 |  | ||||||
| qemu-tools |  | ||||||
| tgt # NOPRIME |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| dstat |  | ||||||
| @@ -1,34 +0,0 @@ | |||||||
| apache2 |  | ||||||
| apache2-devel |  | ||||||
| bc |  | ||||||
| ca-certificates-mozilla |  | ||||||
| curl |  | ||||||
| gawk |  | ||||||
| gcc |  | ||||||
| gcc-c++ |  | ||||||
| git-core |  | ||||||
| graphviz # docs |  | ||||||
| iputils |  | ||||||
| libffi-devel  # pyOpenSSL |  | ||||||
| libjpeg8-devel # Pillow 3.0.0 |  | ||||||
| libopenssl-devel # to rebuild pyOpenSSL if needed |  | ||||||
| libxslt-devel  # lxml |  | ||||||
| lsof # useful when debugging |  | ||||||
| make |  | ||||||
| net-tools |  | ||||||
| openssh |  | ||||||
| openssl |  | ||||||
| pcre-devel # python-pcre |  | ||||||
| postgresql-devel  # psycopg2 |  | ||||||
| psmisc |  | ||||||
| python3-systemd |  | ||||||
| python-cmd2 # dist:opensuse-12.3 |  | ||||||
| python-devel  # pyOpenSSL |  | ||||||
| python-xml |  | ||||||
| tar |  | ||||||
| tcpdump |  | ||||||
| unzip |  | ||||||
| util-linux |  | ||||||
| wget |  | ||||||
| which |  | ||||||
| zlib-devel |  | ||||||
| @@ -1,2 +0,0 @@ | |||||||
| apache2-mod_wsgi  # NOPRIME |  | ||||||
| apache2  # NOPRIME |  | ||||||
| @@ -1,4 +0,0 @@ | |||||||
| cyrus-sasl-devel |  | ||||||
| memcached |  | ||||||
| openldap2-devel |  | ||||||
| sqlite3 |  | ||||||
| @@ -1,3 +0,0 @@ | |||||||
| openldap2 |  | ||||||
| openldap2-client |  | ||||||
| python-ldap |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| python-dateutil |  | ||||||
| @@ -1,10 +0,0 @@ | |||||||
| cdrkit-cdrtools-compat # dist:sle12 |  | ||||||
| cryptsetup |  | ||||||
| dosfstools |  | ||||||
| libosinfo |  | ||||||
| lvm2 |  | ||||||
| mkisofs # not:sle12 |  | ||||||
| open-iscsi |  | ||||||
| sg3_utils |  | ||||||
| # Stuff for diablo volumes |  | ||||||
| sysfsutils |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| ipset |  | ||||||
| @@ -1,12 +0,0 @@ | |||||||
| acl |  | ||||||
| dnsmasq |  | ||||||
| dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1 |  | ||||||
| ebtables |  | ||||||
| haproxy # to serve as metadata proxy inside router/dhcp namespaces |  | ||||||
| iptables |  | ||||||
| iputils |  | ||||||
| rabbitmq-server # NOPRIME |  | ||||||
| radvd # NOPRIME |  | ||||||
| sqlite3 |  | ||||||
| sudo |  | ||||||
| vlan |  | ||||||
| @@ -1,2 +0,0 @@ | |||||||
| conntrack-tools |  | ||||||
| keepalived |  | ||||||
| @@ -1,21 +0,0 @@ | |||||||
| cdrkit-cdrtools-compat # dist:sle12 |  | ||||||
| conntrack-tools |  | ||||||
| curl |  | ||||||
| ebtables |  | ||||||
| iptables |  | ||||||
| iputils |  | ||||||
| kpartx |  | ||||||
| kvm # NOPRIME |  | ||||||
| libvirt # NOPRIME |  | ||||||
| libvirt-python # NOPRIME |  | ||||||
| # mkisofs is required for config_drive |  | ||||||
| mkisofs # not:sle12 |  | ||||||
| parted |  | ||||||
| polkit |  | ||||||
| # qemu as fallback if kvm cannot be used |  | ||||||
| qemu # NOPRIME |  | ||||||
| rabbitmq-server # NOPRIME |  | ||||||
| socat |  | ||||||
| sqlite3 |  | ||||||
| sudo |  | ||||||
| vlan |  | ||||||
| @@ -1,3 +0,0 @@ | |||||||
|  |  | ||||||
| openvswitch |  | ||||||
| openvswitch-switch |  | ||||||
| @@ -1,2 +0,0 @@ | |||||||
| lsscsi |  | ||||||
| open-iscsi |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| neutron-agent |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| neutron-l3 |  | ||||||
| @@ -1,6 +0,0 @@ | |||||||
| curl |  | ||||||
| liberasurecode-devel |  | ||||||
| memcached |  | ||||||
| sqlite3 |  | ||||||
| xfsprogs |  | ||||||
| xinetd |  | ||||||
| @@ -454,16 +454,6 @@ function GetDistro { | |||||||
|     elif [[ "$os_VENDOR" =~ (Fedora) ]]; then |     elif [[ "$os_VENDOR" =~ (Fedora) ]]; then | ||||||
|         # For Fedora, just use 'f' and the release |         # For Fedora, just use 'f' and the release | ||||||
|         DISTRO="f$os_RELEASE" |         DISTRO="f$os_RELEASE" | ||||||
|     elif is_opensuse; then |  | ||||||
|         DISTRO="opensuse-$os_RELEASE" |  | ||||||
|         # Tumbleweed uses "n/a" as a codename, and the release is a datestring |  | ||||||
|         # like 20180218, so not very useful. Leap however uses a release |  | ||||||
|         # with a "dot", so for example 15.0 |  | ||||||
|         [ "$os_CODENAME" = "n/a" -a "$os_RELEASE" = "${os_RELEASE/\./}" ] && \ |  | ||||||
|             DISTRO="opensuse-tumbleweed" |  | ||||||
|     elif is_suse_linux_enterprise; then |  | ||||||
|         # just use major release |  | ||||||
|         DISTRO="sle${os_RELEASE%.*}" |  | ||||||
|     elif [[ "$os_VENDOR" =~ (Red.*Hat) || \ |     elif [[ "$os_VENDOR" =~ (Red.*Hat) || \ | ||||||
|         "$os_VENDOR" =~ (CentOS) || \ |         "$os_VENDOR" =~ (CentOS) || \ | ||||||
|         "$os_VENDOR" =~ (AlmaLinux) || \ |         "$os_VENDOR" =~ (AlmaLinux) || \ | ||||||
| @@ -537,37 +527,6 @@ function is_fedora { | |||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
| # Determine if current distribution is a SUSE-based distribution |  | ||||||
| # (openSUSE, SLE). |  | ||||||
| # is_suse |  | ||||||
| function is_suse { |  | ||||||
|     is_opensuse || is_suse_linux_enterprise |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # Determine if current distribution is an openSUSE distribution |  | ||||||
| # is_opensuse |  | ||||||
| function is_opensuse { |  | ||||||
|     if [[ -z "$os_VENDOR" ]]; then |  | ||||||
|         GetOSVersion |  | ||||||
|     fi |  | ||||||
|  |  | ||||||
|     [[ "$os_VENDOR" =~ (openSUSE) ]] |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # Determine if current distribution is a SUSE Linux Enterprise (SLE) |  | ||||||
| # distribution |  | ||||||
| # is_suse_linux_enterprise |  | ||||||
| function is_suse_linux_enterprise { |  | ||||||
|     if [[ -z "$os_VENDOR" ]]; then |  | ||||||
|         GetOSVersion |  | ||||||
|     fi |  | ||||||
|  |  | ||||||
|     [[ "$os_VENDOR" =~ (^SUSE) ]] |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # Determine if current distribution is an Ubuntu-based distribution | # Determine if current distribution is an Ubuntu-based distribution | ||||||
| # It will also detect non-Ubuntu but Debian-based distros | # It will also detect non-Ubuntu but Debian-based distros | ||||||
| # is_ubuntu | # is_ubuntu | ||||||
| @@ -1168,8 +1127,6 @@ function _get_package_dir { | |||||||
|         pkg_dir=$base_dir/debs |         pkg_dir=$base_dir/debs | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         pkg_dir=$base_dir/rpms |         pkg_dir=$base_dir/rpms | ||||||
|     elif is_suse; then |  | ||||||
|         pkg_dir=$base_dir/rpms-suse |  | ||||||
|     else |     else | ||||||
|         exit_distro_not_supported "list of packages" |         exit_distro_not_supported "list of packages" | ||||||
|     fi |     fi | ||||||
| @@ -1444,8 +1401,6 @@ function real_install_package { | |||||||
|         apt_get install "$@" |         apt_get install "$@" | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         yum_install "$@" |         yum_install "$@" | ||||||
|     elif is_suse; then |  | ||||||
|         zypper_install "$@" |  | ||||||
|     else |     else | ||||||
|         exit_distro_not_supported "installing packages" |         exit_distro_not_supported "installing packages" | ||||||
|     fi |     fi | ||||||
| @@ -1487,8 +1442,6 @@ function uninstall_package { | |||||||
|         apt_get purge "$@" |         apt_get purge "$@" | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         sudo dnf remove -y "$@" ||: |         sudo dnf remove -y "$@" ||: | ||||||
|     elif is_suse; then |  | ||||||
|         sudo zypper remove -y "$@" ||: |  | ||||||
|     else |     else | ||||||
|         exit_distro_not_supported "uninstalling packages" |         exit_distro_not_supported "uninstalling packages" | ||||||
|     fi |     fi | ||||||
|   | |||||||
| @@ -7,7 +7,6 @@ | |||||||
| # External functions used: | # External functions used: | ||||||
| # - GetOSVersion | # - GetOSVersion | ||||||
| # - is_fedora | # - is_fedora | ||||||
| # - is_suse |  | ||||||
| # - safe_chown | # - safe_chown | ||||||
|  |  | ||||||
| # Save trace setting | # Save trace setting | ||||||
| @@ -62,7 +61,6 @@ function get_python_exec_prefix { | |||||||
|     $xtrace |     $xtrace | ||||||
|  |  | ||||||
|     local PYTHON_PATH=/usr/local/bin |     local PYTHON_PATH=/usr/local/bin | ||||||
|     is_suse && PYTHON_PATH=/usr/bin |  | ||||||
|     echo $PYTHON_PATH |     echo $PYTHON_PATH | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -462,8 +460,6 @@ function install_python { | |||||||
| function install_python3 { | function install_python3 { | ||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         apt_get install python${PYTHON3_VERSION} python${PYTHON3_VERSION}-dev |         apt_get install python${PYTHON3_VERSION} python${PYTHON3_VERSION}-dev | ||||||
|     elif is_suse; then |  | ||||||
|         install_package python3-devel python3-dbm |  | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         if [ "$os_VENDOR" = "Fedora" ]; then |         if [ "$os_VENDOR" = "Fedora" ]; then | ||||||
|             install_package python${PYTHON3_VERSION//.} |             install_package python${PYTHON3_VERSION//.} | ||||||
|   | |||||||
							
								
								
									
										25
									
								
								lib/apache
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								lib/apache
									
									
									
									
									
								
							| @@ -44,10 +44,6 @@ elif is_fedora; then | |||||||
|     APACHE_NAME=httpd |     APACHE_NAME=httpd | ||||||
|     APACHE_CONF_DIR=${APACHE_CONF_DIR:-/etc/$APACHE_NAME/conf.d} |     APACHE_CONF_DIR=${APACHE_CONF_DIR:-/etc/$APACHE_NAME/conf.d} | ||||||
|     APACHE_SETTINGS_DIR=${APACHE_SETTINGS_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 | fi | ||||||
| APACHE_LOG_DIR="/var/log/${APACHE_NAME}" | APACHE_LOG_DIR="/var/log/${APACHE_NAME}" | ||||||
|  |  | ||||||
| @@ -65,11 +61,6 @@ function enable_apache_mod { | |||||||
|             sudo a2enmod $mod |             sudo a2enmod $mod | ||||||
|             restart_apache_server |             restart_apache_server | ||||||
|         fi |         fi | ||||||
|     elif is_suse; then |  | ||||||
|         if ! a2enmod -q $mod ; then |  | ||||||
|             sudo a2enmod $mod |  | ||||||
|             restart_apache_server |  | ||||||
|         fi |  | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         # pass |         # pass | ||||||
|         true |         true | ||||||
| @@ -104,10 +95,6 @@ function install_apache_uwsgi { | |||||||
|         # Thus there is nothing else to do after this install |         # Thus there is nothing else to do after this install | ||||||
|         install_package uwsgi \ |         install_package uwsgi \ | ||||||
|                         uwsgi-plugin-python3 |                         uwsgi-plugin-python3 | ||||||
|     elif [[ $os_VENDOR =~ openSUSE ]]; then |  | ||||||
|         install_package uwsgi \ |  | ||||||
|                         uwsgi-python3 \ |  | ||||||
|                         apache2-mod_uwsgi |  | ||||||
|     else |     else | ||||||
|         # Compile uwsgi from source. |         # Compile uwsgi from source. | ||||||
|         local dir |         local dir | ||||||
| @@ -125,7 +112,7 @@ function install_apache_uwsgi { | |||||||
|         sudo rm -rf $dir |         sudo rm -rf $dir | ||||||
|     fi |     fi | ||||||
|  |  | ||||||
|     if is_ubuntu || is_suse ; then |     if is_ubuntu; then | ||||||
|         # we've got to enable proxy and proxy_uwsgi for this to work |         # we've got to enable proxy and proxy_uwsgi for this to work | ||||||
|         sudo a2enmod proxy |         sudo a2enmod proxy | ||||||
|         sudo a2enmod proxy_uwsgi |         sudo a2enmod proxy_uwsgi | ||||||
| @@ -155,8 +142,6 @@ function install_apache_wsgi { | |||||||
|         sudo sed -i '/mod_mpm_prefork.so/s/^/#/g' /etc/httpd/conf.modules.d/00-mpm.conf |         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_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 |         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 |     else | ||||||
|         exit_distro_not_supported "apache wsgi installation" |         exit_distro_not_supported "apache wsgi installation" | ||||||
|     fi |     fi | ||||||
| @@ -171,7 +156,7 @@ function install_apache_wsgi { | |||||||
| # recognise it. a2ensite and a2dissite ignore the .conf suffix used as parameter. The default sites' | # recognise it. a2ensite and a2dissite ignore the .conf suffix used as parameter. The default sites' | ||||||
| # files are 000-default.conf and default-ssl.conf. | # 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. | # On RHEL and CentOS, things should hopefully work as in Fedora. | ||||||
| # | # | ||||||
| @@ -187,7 +172,7 @@ function apache_site_config_for { | |||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         # Ubuntu 14.04 - Apache 2.4 |         # Ubuntu 14.04 - Apache 2.4 | ||||||
|         echo $APACHE_CONF_DIR/${site}.conf |         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 |         # 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" |         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf" | ||||||
|         if [ -f $enabled_site_file ]; then |         if [ -f $enabled_site_file ]; then | ||||||
| @@ -205,7 +190,7 @@ function enable_apache_site { | |||||||
|     enable_apache_mod version |     enable_apache_mod version | ||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         sudo a2ensite ${site} |         sudo a2ensite ${site} | ||||||
|     elif is_fedora || is_suse; then |     elif is_fedora; then | ||||||
|         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf" |         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf" | ||||||
|         # Do nothing if site already enabled or no site config exists |         # Do nothing if site already enabled or no site config exists | ||||||
|         if [[ -f ${enabled_site_file}.disabled ]] && [[ ! -f ${enabled_site_file} ]]; then |         if [[ -f ${enabled_site_file}.disabled ]] && [[ ! -f ${enabled_site_file} ]]; then | ||||||
| @@ -219,7 +204,7 @@ function disable_apache_site { | |||||||
|     local site=$@ |     local site=$@ | ||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         sudo a2dissite ${site} || true |         sudo a2dissite ${site} || true | ||||||
|     elif is_fedora || is_suse; then |     elif is_fedora; then | ||||||
|         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf" |         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf" | ||||||
|         # Do nothing if no site config exists |         # Do nothing if no site config exists | ||||||
|         if [[ -f ${enabled_site_file} ]]; then |         if [[ -f ${enabled_site_file} ]]; then | ||||||
|   | |||||||
| @@ -117,8 +117,8 @@ else | |||||||
| fi | fi | ||||||
|  |  | ||||||
|  |  | ||||||
| # EL and SUSE should only use lioadm | # EL should only use lioadm | ||||||
| if is_fedora || is_suse; then | if is_fedora; then | ||||||
|     if [[ ${CINDER_TARGET_HELPER} != "lioadm" && ${CINDER_TARGET_HELPER} != 'nvmet' ]]; 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" |         die "lioadm and nvmet are the only valid Cinder target_helper config on this platform" | ||||||
|     fi |     fi | ||||||
| @@ -595,11 +595,6 @@ function start_cinder { | |||||||
|             _configure_tgt_for_config_d |             _configure_tgt_for_config_d | ||||||
|             if is_ubuntu; then |             if is_ubuntu; then | ||||||
|                 sudo service tgt restart |                 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 |             else | ||||||
|                 restart_service tgtd |                 restart_service tgtd | ||||||
|             fi |             fi | ||||||
|   | |||||||
| @@ -20,12 +20,6 @@ if [[ -z "$MYSQL_SERVICE_NAME" ]]; then | |||||||
|     MYSQL_SERVICE_NAME=mysql |     MYSQL_SERVICE_NAME=mysql | ||||||
|     if is_fedora && ! is_oraclelinux; then |     if is_fedora && ! is_oraclelinux; then | ||||||
|         MYSQL_SERVICE_NAME=mariadb |         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 |     elif [[ "$DISTRO" == "bullseye" ]]; then | ||||||
|         MYSQL_SERVICE_NAME=mariadb |         MYSQL_SERVICE_NAME=mariadb | ||||||
|     fi |     fi | ||||||
| @@ -54,7 +48,7 @@ function cleanup_database_mysql { | |||||||
|     elif is_oraclelinux; then |     elif is_oraclelinux; then | ||||||
|         uninstall_package mysql-community-server |         uninstall_package mysql-community-server | ||||||
|         sudo rm -rf /var/lib/mysql |         sudo rm -rf /var/lib/mysql | ||||||
|     elif is_suse || is_fedora; then |     elif is_fedora; then | ||||||
|         uninstall_package mariadb-server |         uninstall_package mariadb-server | ||||||
|         sudo rm -rf /var/lib/mysql |         sudo rm -rf /var/lib/mysql | ||||||
|     else |     else | ||||||
| @@ -74,7 +68,7 @@ function configure_database_mysql { | |||||||
|  |  | ||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         my_conf=/etc/mysql/my.cnf |         my_conf=/etc/mysql/my.cnf | ||||||
|     elif is_suse || is_oraclelinux; then |     elif is_oraclelinux; then | ||||||
|         my_conf=/etc/my.cnf |         my_conf=/etc/my.cnf | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         my_conf=/etc/my.cnf |         my_conf=/etc/my.cnf | ||||||
| @@ -90,7 +84,7 @@ function configure_database_mysql { | |||||||
|     iniset -sudo $my_conf mysqld bind-address "$(ipv6_unquote $SERVICE_LISTEN_ADDRESS)" |     iniset -sudo $my_conf mysqld bind-address "$(ipv6_unquote $SERVICE_LISTEN_ADDRESS)" | ||||||
|  |  | ||||||
|     # (Re)Start mysql-server |     # (Re)Start mysql-server | ||||||
|     if is_fedora || is_suse; then |     if is_fedora; then | ||||||
|         # service is not started by default |         # service is not started by default | ||||||
|         start_service $MYSQL_SERVICE_NAME |         start_service $MYSQL_SERVICE_NAME | ||||||
|     elif is_ubuntu; then |     elif is_ubuntu; then | ||||||
| @@ -212,9 +206,6 @@ EOF | |||||||
|         elif is_fedora; then |         elif is_fedora; then | ||||||
|             install_package mariadb-server mariadb-devel mariadb |             install_package mariadb-server mariadb-devel mariadb | ||||||
|             sudo systemctl enable $MYSQL_SERVICE_NAME |             sudo systemctl enable $MYSQL_SERVICE_NAME | ||||||
|         elif is_suse; then |  | ||||||
|             install_package mariadb-server |  | ||||||
|             sudo systemctl enable $MYSQL_SERVICE_NAME |  | ||||||
|         elif is_ubuntu; then |         elif is_ubuntu; then | ||||||
|             install_package $MYSQL_SERVICE_NAME-server |             install_package $MYSQL_SERVICE_NAME-server | ||||||
|         else |         else | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ function cleanup_database_postgresql { | |||||||
|         # Get ruthless with mysql |         # Get ruthless with mysql | ||||||
|         apt_get purge -y postgresql* |         apt_get purge -y postgresql* | ||||||
|         return |         return | ||||||
|     elif is_fedora || is_suse; then |     elif is_fedora; then | ||||||
|         uninstall_package postgresql-server |         uninstall_package postgresql-server | ||||||
|     else |     else | ||||||
|         return |         return | ||||||
| @@ -66,11 +66,6 @@ function configure_database_postgresql { | |||||||
|         pg_dir=`find /etc/postgresql -name pg_hba.conf|xargs dirname` |         pg_dir=`find /etc/postgresql -name pg_hba.conf|xargs dirname` | ||||||
|         pg_hba=$pg_dir/pg_hba.conf |         pg_hba=$pg_dir/pg_hba.conf | ||||||
|         pg_conf=$pg_dir/postgresql.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 |     else | ||||||
|         exit_distro_not_supported "postgresql configuration" |         exit_distro_not_supported "postgresql configuration" | ||||||
|     fi |     fi | ||||||
| @@ -107,7 +102,7 @@ EOF | |||||||
|     if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then |     if [[ "$INSTALL_DATABASE_SERVER_PACKAGES" == "True" ]]; then | ||||||
|         if is_ubuntu; then |         if is_ubuntu; then | ||||||
|             install_package postgresql |             install_package postgresql | ||||||
|         elif is_fedora || is_suse; then |         elif is_fedora; then | ||||||
|             install_package postgresql-server |             install_package postgresql-server | ||||||
|             if is_fedora; then |             if is_fedora; then | ||||||
|                 sudo systemctl enable postgresql |                 sudo systemctl enable postgresql | ||||||
|   | |||||||
| @@ -47,10 +47,6 @@ USE_CINDER_FOR_GLANCE=$(trueorfalse False USE_CINDER_FOR_GLANCE) | |||||||
| # from CINDER_ENABLED_BACKENDS | # from CINDER_ENABLED_BACKENDS | ||||||
| GLANCE_CINDER_DEFAULT_BACKEND=${GLANCE_CINDER_DEFAULT_BACKEND:-lvmdriver-1} | GLANCE_CINDER_DEFAULT_BACKEND=${GLANCE_CINDER_DEFAULT_BACKEND:-lvmdriver-1} | ||||||
| GLANCE_STORE_ROOTWRAP_BASE_DIR=/usr/local/etc/glance | 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 | # 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 | # optimize bootable volume creation by allowing volumes to be cloned directly | ||||||
| # in the backend instead of transferring data via Glance.  To use this feature, | # in the backend instead of transferring data via Glance.  To use this feature, | ||||||
|   | |||||||
| @@ -129,7 +129,7 @@ function configure_horizon { | |||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         disable_apache_site 000-default |         disable_apache_site 000-default | ||||||
|         sudo touch $horizon_conf |         sudo touch $horizon_conf | ||||||
|     elif is_fedora || is_suse; then |     elif is_fedora; then | ||||||
|         : # nothing to do |         : # nothing to do | ||||||
|     else |     else | ||||||
|         exit_distro_not_supported "horizon apache configuration" |         exit_distro_not_supported "horizon apache configuration" | ||||||
|   | |||||||
							
								
								
									
										14
									
								
								lib/ldap
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								lib/ldap
									
									
									
									
									
								
							| @@ -39,13 +39,6 @@ elif is_fedora; then | |||||||
|     LDAP_OLCDB_NUMBER=2 |     LDAP_OLCDB_NUMBER=2 | ||||||
|     LDAP_OLCDB_TYPE=hdb |     LDAP_OLCDB_TYPE=hdb | ||||||
|     LDAP_ROOTPW_COMMAND=add |     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 | fi | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -76,8 +69,6 @@ function cleanup_ldap { | |||||||
|         sudo rm -rf /etc/ldap/ldap.conf /var/lib/ldap |         sudo rm -rf /etc/ldap/ldap.conf /var/lib/ldap | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         sudo rm -rf /etc/openldap /var/lib/ldap |         sudo rm -rf /etc/openldap /var/lib/ldap | ||||||
|     elif is_suse; then |  | ||||||
|         sudo rm -rf /var/lib/ldap |  | ||||||
|     fi |     fi | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -126,11 +117,6 @@ function install_ldap { | |||||||
|         configure_ldap |         configure_ldap | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         start_ldap |         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 |     fi | ||||||
|  |  | ||||||
|     echo "LDAP_PASSWORD is $LDAP_PASSWORD" |     echo "LDAP_PASSWORD is $LDAP_PASSWORD" | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								lib/lvm
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								lib/lvm
									
									
									
									
									
								
							| @@ -129,8 +129,8 @@ function init_lvm_volume_group { | |||||||
|     local vg=$1 |     local vg=$1 | ||||||
|     local size=$2 |     local size=$2 | ||||||
|  |  | ||||||
|     # Start the tgtd service on Fedora and SUSE if tgtadm is used |     # Start the tgtd service on Fedora if tgtadm is used | ||||||
|     if  is_fedora || is_suse  && [[ "$CINDER_TARGET_HELPER" = "tgtadm" ]]; then |     if  is_fedora; then | ||||||
|         start_service tgtd |         start_service tgtd | ||||||
|     fi |     fi | ||||||
|  |  | ||||||
|   | |||||||
| @@ -80,19 +80,6 @@ function _neutron_ovs_base_install_agent_packages { | |||||||
|         elif is_fedora; then |         elif is_fedora; then | ||||||
|             restart_service openvswitch |             restart_service openvswitch | ||||||
|             sudo systemctl enable 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 | ||||||
|     fi |     fi | ||||||
| } | } | ||||||
|   | |||||||
| @@ -182,12 +182,6 @@ function action_openvswitch { | |||||||
|         ${action}_service openvswitch-switch |         ${action}_service openvswitch-switch | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         ${action}_service openvswitch |         ${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 |     fi | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								lib/nova
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								lib/nova
									
									
									
									
									
								
							| @@ -448,8 +448,8 @@ function create_nova_conf { | |||||||
|  |  | ||||||
|     iniset $NOVA_CONF key_manager backend nova.keymgr.conf_key_mgr.ConfKeyManager |     iniset $NOVA_CONF key_manager backend nova.keymgr.conf_key_mgr.ConfKeyManager | ||||||
|  |  | ||||||
|     if is_fedora || is_suse; then |     if is_fedora; then | ||||||
|         # nova defaults to /usr/local/bin, but fedora and suse pip like to |         # nova defaults to /usr/local/bin, but fedora pip like to | ||||||
|         # install things in /usr/bin |         # install things in /usr/bin | ||||||
|         iniset $NOVA_CONF DEFAULT bindir "/usr/bin" |         iniset $NOVA_CONF DEFAULT bindir "/usr/bin" | ||||||
|     fi |     fi | ||||||
| @@ -523,7 +523,7 @@ function create_nova_conf { | |||||||
|  |  | ||||||
|     # nova defaults to genisoimage but only mkisofs is available for 15.0+ |     # nova defaults to genisoimage but only mkisofs is available for 15.0+ | ||||||
|     # rhel provides mkisofs symlink to genisoimage or xorriso appropiately |     # 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 |         iniset $NOVA_CONF DEFAULT mkisofs_cmd /usr/bin/mkisofs | ||||||
|     fi |     fi | ||||||
|  |  | ||||||
|   | |||||||
| @@ -74,7 +74,7 @@ function install_libvirt { | |||||||
|             install_package qemu-efi |             install_package qemu-efi | ||||||
|         fi |         fi | ||||||
|         #pip_install_gr <there-si-no-guestfs-in-pypi> |         #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 |         # Optionally enable the virt-preview repo when on Fedora | ||||||
|         if [[ $DISTRO =~ f[0-9][0-9] ]] && [[ ${ENABLE_FEDORA_VIRT_PREVIEW_REPO} == "True" ]]; then |         if [[ $DISTRO =~ f[0-9][0-9] ]] && [[ ${ENABLE_FEDORA_VIRT_PREVIEW_REPO} == "True" ]]; then | ||||||
| @@ -121,8 +121,8 @@ cgroup_device_acl = [ | |||||||
| EOF | EOF | ||||||
|     fi |     fi | ||||||
|  |  | ||||||
|     if is_fedora || is_suse; then |     if is_fedora; then | ||||||
|         # Starting with fedora 18 and opensuse-12.3 enable stack-user to |         # Starting with fedora 18 enable stack-user to | ||||||
|         # virsh -c qemu:///system by creating a policy-kit rule for |         # virsh -c qemu:///system by creating a policy-kit rule for | ||||||
|         # stack-user using the new Javascript syntax |         # stack-user using the new Javascript syntax | ||||||
|         rules_dir=/etc/polkit-1/rules.d |         rules_dir=/etc/polkit-1/rules.d | ||||||
|   | |||||||
| @@ -114,9 +114,6 @@ function install_nova_hypervisor { | |||||||
|                     sudo dpkg-statoverride --add --update $STAT_OVERRIDE |                     sudo dpkg-statoverride --add --update $STAT_OVERRIDE | ||||||
|                 fi |                 fi | ||||||
|             done |             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 |         elif is_fedora; then | ||||||
|             install_package python3-libguestfs |             install_package python3-libguestfs | ||||||
|         fi |         fi | ||||||
|   | |||||||
| @@ -52,20 +52,7 @@ function install_rpc_backend { | |||||||
|     if is_service_enabled rabbit; then |     if is_service_enabled rabbit; then | ||||||
|         # Install rabbitmq-server |         # Install rabbitmq-server | ||||||
|         install_package rabbitmq-server |         install_package rabbitmq-server | ||||||
|         if is_suse; then |         if is_fedora; 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 |  | ||||||
|             # NOTE(jangutter): If rabbitmq is not running (as in a fresh |             # NOTE(jangutter): If rabbitmq is not running (as in a fresh | ||||||
|             # install) then rabbit_setuser triggers epmd@0.0.0.0.socket with |             # install) then rabbit_setuser triggers epmd@0.0.0.0.socket with | ||||||
|             # socket activation. This fails the first time and does not get |             # socket activation. This fails the first time and does not get | ||||||
|   | |||||||
| @@ -547,9 +547,6 @@ function configure_swift { | |||||||
|     local swift_log_dir=${SWIFT_DATA_DIR}/logs |     local swift_log_dir=${SWIFT_DATA_DIR}/logs | ||||||
|     sudo rm -rf ${swift_log_dir} |     sudo rm -rf ${swift_log_dir} | ||||||
|     local swift_log_group=adm |     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 |     sudo install -d -o ${STACK_USER} -g ${swift_log_group} ${swift_log_dir}/hourly | ||||||
|  |  | ||||||
|     if [[ $SYSLOG != "False" ]]; then |     if [[ $SYSLOG != "False" ]]; then | ||||||
|   | |||||||
							
								
								
									
										12
									
								
								lib/tls
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								lib/tls
									
									
									
									
									
								
							| @@ -212,9 +212,6 @@ function init_CA { | |||||||
|     if is_fedora; then |     if is_fedora; then | ||||||
|         sudo cp $INT_CA_DIR/ca-chain.pem /usr/share/pki/ca-trust-source/anchors/devstack-chain.pem |         sudo cp $INT_CA_DIR/ca-chain.pem /usr/share/pki/ca-trust-source/anchors/devstack-chain.pem | ||||||
|         sudo update-ca-trust |         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 |     elif is_ubuntu; then | ||||||
|         sudo cp $INT_CA_DIR/ca-chain.pem /usr/local/share/ca-certificates/devstack-int.crt |         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 |         sudo cp $ROOT_CA_DIR/cacert.pem /usr/local/share/ca-certificates/devstack-root.crt | ||||||
| @@ -376,9 +373,6 @@ function fix_system_ca_bundle_path { | |||||||
|             elif is_ubuntu; then |             elif is_ubuntu; then | ||||||
|                 sudo rm -f $capath |                 sudo rm -f $capath | ||||||
|                 sudo ln -s /etc/ssl/certs/ca-certificates.crt $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 |             else | ||||||
|                 echo "Don't know how to set the CA bundle, expect the install to fail." |                 echo "Don't know how to set the CA bundle, expect the install to fail." | ||||||
|             fi |             fi | ||||||
| @@ -441,9 +435,6 @@ function enable_mod_ssl { | |||||||
|  |  | ||||||
|     if is_ubuntu; then |     if is_ubuntu; then | ||||||
|         sudo a2enmod ssl |         sudo a2enmod ssl | ||||||
|     elif is_suse; then |  | ||||||
|         sudo a2enmod ssl |  | ||||||
|         sudo a2enflag SSL |  | ||||||
|     elif is_fedora; then |     elif is_fedora; then | ||||||
|         # Fedora enables mod_ssl by default |         # Fedora enables mod_ssl by default | ||||||
|         : |         : | ||||||
| @@ -560,9 +551,6 @@ $listen_string | |||||||
|     CustomLog $APACHE_LOG_DIR/tls-proxy_access.log combined |     CustomLog $APACHE_LOG_DIR/tls-proxy_access.log combined | ||||||
| </VirtualHost> | </VirtualHost> | ||||||
| EOF | EOF | ||||||
|     if is_suse ; then |  | ||||||
|         sudo a2enflag SSL |  | ||||||
|     fi |  | ||||||
|     for mod in headers ssl proxy proxy_http; do |     for mod in headers ssl proxy proxy_http; do | ||||||
|         enable_apache_mod $mod |         enable_apache_mod $mod | ||||||
|     done |     done | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								stack.sh
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								stack.sh
									
									
									
									
									
								
							| @@ -229,7 +229,7 @@ write_devstack_version | |||||||
|  |  | ||||||
| # Warn users who aren't on an explicitly supported distro, but allow them to | # Warn users who aren't on an explicitly supported distro, but allow them to | ||||||
| # override check and attempt installation with ``FORCE=yes ./stack`` | # override check and attempt installation with ``FORCE=yes ./stack`` | ||||||
| SUPPORTED_DISTROS="bullseye|focal|jammy|f36|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9|openEuler-22.03" | SUPPORTED_DISTROS="bullseye|focal|jammy|f36|rhel8|rhel9|openEuler-22.03" | ||||||
|  |  | ||||||
| if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then | if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then | ||||||
|     echo "WARNING: this script has not been tested on $DISTRO" |     echo "WARNING: this script has not been tested on $DISTRO" | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ TOP=$(cd $(dirname "$0")/.. && pwd) | |||||||
| source $TOP/tests/unittest.sh | source $TOP/tests/unittest.sh | ||||||
|  |  | ||||||
| export LC_ALL=en_US.UTF-8 | export LC_ALL=en_US.UTF-8 | ||||||
| PKG_FILES=$(find $TOP/files/debs $TOP/files/rpms $TOP/files/rpms-suse -type f) | PKG_FILES=$(find $TOP/files/debs $TOP/files/rpms -type f) | ||||||
|  |  | ||||||
| TMPDIR=$(mktemp -d) | TMPDIR=$(mktemp -d) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -90,45 +90,6 @@ function fixup_fedora { | |||||||
|     fi |     fi | ||||||
| } | } | ||||||
|  |  | ||||||
| function fixup_suse { |  | ||||||
|     if ! is_suse; then |  | ||||||
|         return |  | ||||||
|     fi |  | ||||||
|  |  | ||||||
|     # Deactivate and disable apparmor profiles in openSUSE and SLE |  | ||||||
|     # distros to avoid issues with haproxy and dnsmasq.  In newer |  | ||||||
|     # releases, systemctl stop apparmor is actually a no-op, so we |  | ||||||
|     # have to use aa-teardown to make sure we've deactivated the |  | ||||||
|     # profiles: |  | ||||||
|     # |  | ||||||
|     # https://www.suse.com/releasenotes/x86_64/SUSE-SLES/15/#fate-325343 |  | ||||||
|     # https://gitlab.com/apparmor/apparmor/merge_requests/81 |  | ||||||
|     # https://build.opensuse.org/package/view_file/openSUSE:Leap:15.2/apparmor/apparmor.service?expand=1 |  | ||||||
|     if sudo systemctl is-active -q apparmor; then |  | ||||||
|         sudo systemctl stop apparmor |  | ||||||
|     fi |  | ||||||
|     if [ -x /usr/sbin/aa-teardown ]; then |  | ||||||
|         sudo /usr/sbin/aa-teardown |  | ||||||
|     fi |  | ||||||
|     if sudo systemctl is-enabled -q apparmor; then |  | ||||||
|         sudo systemctl disable apparmor |  | ||||||
|     fi |  | ||||||
|  |  | ||||||
|     # Since pip10, pip will refuse to uninstall files from packages |  | ||||||
|     # that were created with distutils (rather than more modern |  | ||||||
|     # setuptools).  This is because it technically doesn't have a |  | ||||||
|     # manifest of what to remove.  However, in most cases, simply |  | ||||||
|     # overwriting works.  So this hacks around those packages that |  | ||||||
|     # have been dragged in by some other system dependency |  | ||||||
|     sudo rm -rf /usr/lib/python3.6/site-packages/ply-*.egg-info |  | ||||||
|     sudo rm -rf /usr/lib/python3.6/site-packages/six-*.egg-info |  | ||||||
|  |  | ||||||
|     # Ensure trusted CA certificates are up to date |  | ||||||
|     # See https://bugzilla.suse.com/show_bug.cgi?id=1154871 |  | ||||||
|     # May be removed once a new opensuse-15 image is available in nodepool |  | ||||||
|     sudo zypper up -y p11-kit ca-certificates-mozilla |  | ||||||
| } |  | ||||||
|  |  | ||||||
| function fixup_ovn_centos { | function fixup_ovn_centos { | ||||||
|     if [[ $os_VENDOR != "CentOS" ]]; then |     if [[ $os_VENDOR != "CentOS" ]]; then | ||||||
|         return |         return | ||||||
| @@ -156,5 +117,4 @@ function fixup_ubuntu { | |||||||
| function fixup_all { | function fixup_all { | ||||||
|     fixup_ubuntu |     fixup_ubuntu | ||||||
|     fixup_fedora |     fixup_fedora | ||||||
|     fixup_suse |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -74,8 +74,6 @@ install_package $PACKAGES | |||||||
| if [[ -n "$SYSLOG" && "$SYSLOG" != "False" ]]; then | if [[ -n "$SYSLOG" && "$SYSLOG" != "False" ]]; then | ||||||
|     if is_ubuntu || is_fedora; then |     if is_ubuntu || is_fedora; then | ||||||
|         install_package rsyslog-relp |         install_package rsyslog-relp | ||||||
|     elif is_suse; then |  | ||||||
|         install_package rsyslog-module-relp |  | ||||||
|     else |     else | ||||||
|         exit_distro_not_supported "rsyslog-relp installation" |         exit_distro_not_supported "rsyslog-relp installation" | ||||||
|     fi |     fi | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Martin Kopec
					Martin Kopec