Merge "[OVN] Use OVN from packages"
diff --git a/.zuul.yaml b/.zuul.yaml
index e71ac8d..c140671 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -737,15 +737,6 @@
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- # NOTE(gmann): Remove this job from devstack pipeline once it is
- # migrated to zuulv3 native. This is legacy job and rely on
- # devstack-gate + devstack setting so any change in devstack can
- # break it.
- - nova-live-migration:
- voting: false
- irrelevant-files:
- - ^.*\.rst$
- - ^doc/.*$
gate:
jobs:
- devstack
diff --git a/clean.sh b/clean.sh
index cb0a8b4..4cebf1d 100755
--- a/clean.sh
+++ b/clean.sh
@@ -145,3 +145,5 @@
rm -rf ~/.config/openstack
+# Clear any fstab entries made
+sudo sed -i '/.*comment=devstack-.*/ d' /etc/fstab
diff --git a/functions b/functions
index cc1ca6c..e679b0f 100644
--- a/functions
+++ b/functions
@@ -751,12 +751,13 @@
fi
-# create_disk - Create backing disk
+# create_disk - Create, configure, and mount a backing disk
function create_disk {
local node_number
local disk_image=${1}
local storage_data_dir=${2}
local loopback_disk_size=${3}
+ local key
# Create a loopback disk and format it to XFS.
if [[ -e ${disk_image} ]]; then
@@ -777,11 +778,34 @@
# Swift and Ceph.
sudo mkfs.xfs -f -i size=1024 ${disk_image}
- # Mount the disk with mount options to make it as efficient as possible
- if ! egrep -q ${storage_data_dir} /proc/mounts; then
- sudo mount -t xfs -o loop,noatime,nodiratime,logbufs=8 \
- ${disk_image} ${storage_data_dir}
+ # Unmount the target, if mounted
+ if egrep -q $storage_data_dir /proc/mounts; then
+ sudo umount $storage_data_dir
fi
+
+ # Clear any old fstab rules, install a new one for this disk, and mount it
+ key=$(echo $disk_image | sed 's#/.##')
+ key="devstack-$key"
+ sudo sed -i '/.*comment=$key.*/ d' /etc/fstab
+ echo "$disk_image $storage_data_dir xfs loop,noatime,nodiratime,logbufs=8,comment=$key 0 0" | sudo tee -a /etc/fstab
+ sudo mount -v $storage_data_dir
+}
+
+# Unmount, de-configure, and destroy a backing disk
+function destroy_disk {
+ local disk_image=$1
+ local storage_data_dir=$2
+
+ # Unmount the target, if mounted
+ if egrep -q $storage_data_dir /proc/mounts; then
+ sudo umount $storage_data_dir
+ fi
+
+ # Clear any fstab rules
+ sed -i '/.*comment=$key.*/ d' /etc/fstab
+
+ # Delete the file
+ sudo rm $disk_image
}
diff --git a/functions-common b/functions-common
index 547f6df..87d8c64 100644
--- a/functions-common
+++ b/functions-common
@@ -452,8 +452,8 @@
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
[ "$os_VENDOR" = "RedHatEnterprise" ] || \
- [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleServer" ] || \
- [ "$os_VENDOR" = "Virtuozzo" ]
+ [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "CentOSStream" ] || \
+ [ "$os_VENDOR" = "OracleServer" ] || [ "$os_VENDOR" = "Virtuozzo" ]
}
@@ -1609,10 +1609,6 @@
}
-function tail_log {
- deprecated "With the removal of screen support, tail_log is deprecated and will be removed after Queens"
-}
-
# Plugin Functions
# =================
diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index b25bc0c..321775d 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -100,7 +100,7 @@
if [[ "$ENABLE_FILE_INJECTION" == "True" ]] ; then
if is_ubuntu; then
- install_package python-guestfs
+ install_package python3-guestfs
# NOTE(andreaf) Ubuntu kernel can only be read by root, which breaks libguestfs:
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725)
INSTALLED_KERNELS="$(ls /boot/vmlinuz-*)"
diff --git a/lib/placement b/lib/placement
index 2a449bf..b779866 100644
--- a/lib/placement
+++ b/lib/placement
@@ -148,7 +148,6 @@
else
enable_apache_site placement-api
restart_apache_server
- tail_log placement-api /var/log/$APACHE_NAME/placement-api.log
fi
echo "Waiting for placement-api to start..."
diff --git a/lib/swift b/lib/swift
index a981dfc..790fb99 100644
--- a/lib/swift
+++ b/lib/swift
@@ -741,7 +741,9 @@
function install_swift {
git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
- setup_develop $SWIFT_DIR
+ # keystonemiddleware needs to be installed via keystone extras as defined
+ # in setup.cfg, see bug #1909018 for more details.
+ setup_develop $SWIFT_DIR keystone
if [ "$SWIFT_USE_MOD_WSGI" == "True" ]; then
install_apache_wsgi
fi
diff --git a/lib/tempest b/lib/tempest
index c55531b..552e1c2 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -575,6 +575,7 @@
iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False
iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
else
+ iniset $TEMPEST_CONFIG compute-feature-enabled shelve_migrate True
iniset $TEMPEST_CONFIG compute-feature-enabled stable_rescue True
iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True
fi
diff --git a/lib/tls b/lib/tls
index 861496d..b3cc0b4 100644
--- a/lib/tls
+++ b/lib/tls
@@ -570,14 +570,6 @@
restart_apache_server
}
-# Follow TLS proxy
-function follow_tls_proxy {
- sudo touch /var/log/$APACHE_NAME/tls-proxy_error.log
- tail_log tls-error /var/log/$APACHE_NAME/tls-proxy_error.log
- sudo touch /var/log/$APACHE_NAME/tls-proxy_access.log
- tail_log tls-proxy /var/log/$APACHE_NAME/tls-proxy_access.log
-}
-
# Cleanup Functions
# =================
diff --git a/playbooks/pre.yaml b/playbooks/pre.yaml
index ff97a1f..68cb1d8 100644
--- a/playbooks/pre.yaml
+++ b/playbooks/pre.yaml
@@ -19,12 +19,13 @@
{% endfor -%}
{{- mtus|min -}}
- name: Calculate external_bridge_mtu
- # 50 bytes is overhead for vxlan (which is greater than GRE
+ # 30 bytes is overhead for vxlan (which is greater than GRE
# allowing us to use either overlay option with this MTU.
+ # 40 bytes is overhead for IPv6, which will also support an IPv4 overlay.
# TODO(andreaf) This should work, but it may have to be reconcilied with
# the MTU setting used by the multinode setup roles in multinode pre.yaml
set_fact:
- external_bridge_mtu: "{{ local_mtu | int - 50 }}"
+ external_bridge_mtu: "{{ local_mtu | int - 30 - 40 }}"
roles:
- configure-swap
- setup-stack-user
diff --git a/tools/cap-pip.txt b/tools/cap-pip.txt
new file mode 100644
index 0000000..8ee551b
--- /dev/null
+++ b/tools/cap-pip.txt
@@ -0,0 +1 @@
+pip<20.3
diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index f3fd1e2..9afd2e5 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -91,7 +91,9 @@
die $LINENO "Download of get-pip.py failed"
touch $LOCAL_PIP.downloaded
fi
- sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP
+ # TODO: remove the trailing pip constraint when a proper fix
+ # arrives for bug https://bugs.launchpad.net/devstack/+bug/1906322
+ sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
}