| ... | ... |
@@ -29,10 +29,10 @@ |
| 29 | 29 |
- controller |
| 30 | 30 |
|
| 31 | 31 |
- nodeset: |
| 32 |
- name: devstack-single-node-opensuse-423 |
|
| 32 |
+ name: devstack-single-node-opensuse-150 |
|
| 33 | 33 |
nodes: |
| 34 | 34 |
- name: controller |
| 35 |
- label: opensuse-423 |
|
| 35 |
+ label: opensuse-150 |
|
| 36 | 36 |
groups: |
| 37 | 37 |
- name: tempest |
| 38 | 38 |
nodes: |
| ... | ... |
@@ -405,10 +405,10 @@ |
| 405 | 405 |
voting: false |
| 406 | 406 |
|
| 407 | 407 |
- job: |
| 408 |
- name: devstack-platform-opensuse-423 |
|
| 408 |
+ name: devstack-platform-opensuse-150 |
|
| 409 | 409 |
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 |
|
| 412 | 412 |
voting: false |
| 413 | 413 |
|
| 414 | 414 |
- job: |
| ... | ... |
@@ -497,7 +497,7 @@ |
| 497 | 497 |
jobs: |
| 498 | 498 |
- devstack |
| 499 | 499 |
- devstack-platform-centos-7 |
| 500 |
- - devstack-platform-opensuse-423 |
|
| 500 |
+ - devstack-platform-opensuse-150 |
|
| 501 | 501 |
- devstack-platform-opensuse-tumbleweed |
| 502 | 502 |
- devstack-platform-fedora-latest |
| 503 | 503 |
- devstack-multinode |
| ... | ... |
@@ -374,8 +374,10 @@ function GetDistro {
|
| 374 | 374 |
elif [[ "$os_VENDOR" =~ (openSUSE) ]]; then |
| 375 | 375 |
DISTRO="opensuse-$os_RELEASE" |
| 376 | 376 |
# 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" |
|
| 379 | 381 |
elif [[ "$os_VENDOR" =~ (SUSE LINUX) ]]; then |
| 380 | 382 |
# just use major release |
| 381 | 383 |
DISTRO="sle${os_RELEASE%.*}"
|
| ... | ... |
@@ -1376,7 +1378,7 @@ function zypper_install {
|
| 1376 | 1376 |
[[ "$(id -u)" = "0" ]] && sudo="env" |
| 1377 | 1377 |
$sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
|
| 1378 | 1378 |
no_proxy="${no_proxy:-}" \
|
| 1379 |
- zypper --non-interactive install --auto-agree-with-licenses "$@" |
|
| 1379 |
+ zypper --non-interactive install --auto-agree-with-licenses --no-recommends "$@" |
|
| 1380 | 1380 |
} |
| 1381 | 1381 |
|
| 1382 | 1382 |
function write_user_unit_file {
|
| ... | ... |
@@ -221,7 +221,7 @@ write_devstack_version |
| 221 | 221 |
|
| 222 | 222 |
# Warn users who aren't on an explicitly supported distro, but allow them to |
| 223 | 223 |
# 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
|
|
| 225 | 225 |
echo "WARNING: this script has not been tested on $DISTRO" |
| 226 | 226 |
if [[ "$FORCE" != "yes" ]]; then |
| 227 | 227 |
die $LINENO "If you wish to run this script anyway run with FORCE=yes" |
| ... | ... |
@@ -1137,6 +1137,7 @@ if is_service_enabled neutron; then |
| 1137 | 1137 |
echo_summary "Configuring Neutron" |
| 1138 | 1138 |
|
| 1139 | 1139 |
configure_neutron |
| 1140 |
+ |
|
| 1140 | 1141 |
# Run init_neutron only on the node hosting the Neutron API server |
| 1141 | 1142 |
if is_service_enabled $DATABASE_BACKENDS && is_service_enabled neutron; then |
| 1142 | 1143 |
init_neutron |