Merge "Tolerate missing deps in get-stats.py"
diff --git a/.zuul.yaml b/.zuul.yaml
index 8fd4d02..a437c1c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -57,16 +57,6 @@
- controller
- nodeset:
- name: devstack-single-node-centos-8-stream
- nodes:
- - name: controller
- label: centos-8-stream
- groups:
- - name: tempest
- nodes:
- - controller
-
-- nodeset:
name: devstack-single-node-centos-9-stream
nodes:
- name: controller
@@ -147,36 +137,6 @@
- compute1
- nodeset:
- name: openstack-two-node-centos-8-stream
- nodes:
- - name: controller
- label: centos-8-stream
- - name: compute1
- label: centos-8-stream
- groups:
- # Node where tests are executed and test results collected
- - name: tempest
- nodes:
- - controller
- # Nodes running the compute service
- - name: compute
- nodes:
- - controller
- - compute1
- # Nodes that are not the controller
- - name: subnode
- nodes:
- - compute1
- # Switch node for multinode networking setup
- - name: switch
- nodes:
- - controller
- # Peer nodes for multinode networking setup
- - name: peers
- nodes:
- - compute1
-
-- nodeset:
name: openstack-two-node-centos-9-stream
nodes:
- name: controller
@@ -695,16 +655,6 @@
# and these platforms don't have the round-the-clock support to avoid
# becoming blockers in that situation.
- job:
- name: devstack-platform-centos-8-stream
- parent: tempest-full-py3
- description: CentOS 8 Stream platform test
- nodeset: devstack-single-node-centos-8-stream
- voting: false
- timeout: 9000
- vars:
- configure_swap_size: 4096
-
-- job:
name: devstack-platform-centos-9-stream
parent: tempest-full-py3
description: CentOS 9 Stream platform test
@@ -877,7 +827,6 @@
- devstack-ipv6
- devstack-enforce-scope
- devstack-platform-fedora-latest
- - devstack-platform-centos-8-stream
- devstack-platform-centos-9-stream
- devstack-platform-debian-bullseye
- devstack-multinode
diff --git a/files/rpms/general b/files/rpms/general
index 163a7c8..668705b 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -17,6 +17,7 @@
libxslt-devel # lxml
libyaml-devel
make # dist:openEuler-20.03
+mod_ssl # required for tls-proxy on centos 9 stream computes
net-tools
openssh-server
openssl
diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3
index c0d74c7..fbd4692 100644
--- a/lib/neutron_plugins/services/l3
+++ b/lib/neutron_plugins/services/l3
@@ -403,7 +403,10 @@
ext_gw_interface=$(_neutron_get_ext_gw_interface)
local ipv6_cidr_len=${IPV6_PUBLIC_RANGE#*/}
- # Configure interface for public bridge
+ # Configure interface for public bridge by setting the interface
+ # to "up" in case the job is running entirely private network based
+ # testing.
+ sudo ip link set $ext_gw_interface up
sudo ip -6 addr replace $ipv6_ext_gw_ip/$ipv6_cidr_len dev $ext_gw_interface
# Any IPv6 private subnet that uses the default IPV6 subnet pool
# and that is plugged into the default router (Q_ROUTER_NAME) will
diff --git a/tools/get-stats.py b/tools/get-stats.py
index 2418c85..670e723 100755
--- a/tools/get-stats.py
+++ b/tools/get-stats.py
@@ -43,7 +43,7 @@
if not line:
continue
stat, val = line.split('=')
- stats[stat] = int(val)
+ stats[stat] = tryint(val)
return stats