File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2929 - controller
3030
3131- nodeset :
32- name : devstack-single-node-opensuse-423
32+ name : devstack-single-node-opensuse-150
3333 nodes :
3434 - name : controller
35- label : opensuse-423
35+ label : opensuse-150
3636 groups :
3737 - name : tempest
3838 nodes :
405405 voting : false
406406
407407- job :
408- name : devstack-platform-opensuse-423
408+ name : devstack-platform-opensuse-150
409409 parent : tempest-full
410- description : openSUSE 43.2 platform test
411- nodeset : devstack-single-node-opensuse-423
410+ description : openSUSE 15.0 platform test
411+ nodeset : devstack-single-node-opensuse-150
412412 voting : false
413413
414414- job :
497497 jobs :
498498 - devstack
499499 - devstack-platform-centos-7
500- - devstack-platform-opensuse-423
500+ - devstack-platform-opensuse-150
501501 - devstack-platform-opensuse-tumbleweed
502502 - devstack-platform-fedora-latest
503503 - devstack-multinode
Original file line number Diff line number Diff line change @@ -374,8 +374,10 @@ function GetDistro {
374374 elif [[ " $os_VENDOR " =~ (openSUSE) ]]; then
375375 DISTRO=" opensuse-$os_RELEASE "
376376 # Tumbleweed uses "n/a" as a codename, and the release is a datestring
377- # like 20180218, so not very useful.
378- [ " $os_CODENAME " = " n/a" ] && DISTRO=" opensuse-tumbleweed"
377+ # like 20180218, so not very useful. Leap however uses a release
378+ # with a "dot", so for example 15.0
379+ [ " $os_CODENAME " = " n/a" -a " $os_RELEASE " = " ${os_RELEASE/ \. / } " ] && \
380+ DISTRO=" opensuse-tumbleweed"
379381 elif [[ " $os_VENDOR " =~ (SUSE LINUX) ]]; then
380382 # just use major release
381383 DISTRO=" sle${os_RELEASE% .* } "
@@ -1376,7 +1378,7 @@ function zypper_install {
13761378 [[ " $( id -u) " = " 0" ]] && sudo=" env"
13771379 $sudo http_proxy=" ${http_proxy:- } " https_proxy=" ${https_proxy:- } " \
13781380 no_proxy=" ${no_proxy:- } " \
1379- zypper --non-interactive install --auto-agree-with-licenses " $@ "
1381+ zypper --non-interactive install --auto-agree-with-licenses --no-recommends " $@ "
13801382}
13811383
13821384function write_user_unit_file {
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
1616register_database mysql
1717
1818MYSQL_SERVICE_NAME=mysql
19- if is_fedora && ! is_oraclelinux; then
19+ if is_suse || is_fedora && ! is_oraclelinux; then
2020 MYSQL_SERVICE_NAME=mariadb
2121fi
2222
Original file line number Diff line number Diff line change @@ -221,7 +221,7 @@ write_devstack_version
221221
222222# Warn users who aren't on an explicitly supported distro, but allow them to
223223# override check and attempt installation with ``FORCE=yes ./stack``
224- if [[ ! ${DISTRO} =~ (xenial| artful| bionic| stretch| jessie| f27| f28| opensuse-42.3| opensuse-tumbleweed| rhel7) ]]; then
224+ if [[ ! ${DISTRO} =~ (xenial| artful| bionic| stretch| jessie| f27| f28| opensuse-42.3| opensuse-15.0 | opensuse- tumbleweed| rhel7) ]]; then
225225 echo " WARNING: this script has not been tested on $DISTRO "
226226 if [[ " $FORCE " != " yes" ]]; then
227227 die $LINENO " If you wish to run this script anyway run with FORCE=yes"
@@ -1137,6 +1137,7 @@ if is_service_enabled neutron; then
11371137 echo_summary " Configuring Neutron"
11381138
11391139 configure_neutron
1140+
11401141 # Run init_neutron only on the node hosting the Neutron API server
11411142 if is_service_enabled $DATABASE_BACKENDS && is_service_enabled neutron; then
11421143 init_neutron
You can’t perform that action at this time.
0 commit comments