Merge "Handle disappearing pids in mlock_report.py"
diff --git a/lib/cinder b/lib/cinder
index 9c8d85c..34d6186 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -91,8 +91,13 @@
# Default to lioadm
CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm}
-# EL and SUSE should only use lioadm, we continue to allow Ubuntu based
-# deployments to use tgtadm for specific jobs in the cinder-tempest-plugin
+# Bionic needs to default to tgtadm until support is dropped within devstack
+# as the rtslib-fb-targetctl service doesn't start after installing lioadm.
+if is_ubuntu && [[ "$DISTRO" == "bionic" ]]; then
+ CINDER_ISCSI_HELPER=tgtadm
+fi
+
+# EL and SUSE should only use lioadm
if is_fedora || is_suse; then
if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then
die "lioadm is the only valid Cinder target_helper config on this platform"
diff --git a/stack.sh b/stack.sh
index ca9ecfa..163fc5b 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1238,17 +1238,21 @@
# deployments. This ensures the keys match across nova and cinder across all
# hosts.
FIXED_KEY=${FIXED_KEY:-bae3516cc1c0eb18b05440eba8012a4a880a2ee04d584a9c1579445e675b12defdc716ec}
-if is_service_enabled nova; then
- iniset $NOVA_CONF key_manager fixed_key "$FIXED_KEY"
- iniset $NOVA_CPU_CONF key_manager fixed_key "$FIXED_KEY"
-fi
-
if is_service_enabled cinder; then
iniset $CINDER_CONF key_manager fixed_key "$FIXED_KEY"
fi
async_wait configure_neutron_nova
+# NOTE(clarkb): This must come after async_wait configure_neutron_nova because
+# configure_neutron_nova modifies $NOVA_CONF and $NOVA_CPU_CONF as well. If
+# we don't wait then these two ini updates race either other and can result
+# in unexpected configs.
+if is_service_enabled nova; then
+ iniset $NOVA_CONF key_manager fixed_key "$FIXED_KEY"
+ iniset $NOVA_CPU_CONF key_manager fixed_key "$FIXED_KEY"
+fi
+
# Launch the nova-api and wait for it to answer before continuing
if is_service_enabled n-api; then
echo_summary "Starting Nova API"
diff --git a/stackrc b/stackrc
index 9630221..196f61f 100644
--- a/stackrc
+++ b/stackrc
@@ -758,8 +758,8 @@
fi
done
-# 24Gb default volume backing file size
-VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-24G}
+# 30Gb default volume backing file size
+VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-30G}
# Prefixes for volume and instance names
VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:-volume-}