Merge "Switch to OVS/OVN LTS branches"
diff --git a/lib/nova b/lib/nova
index 20e19da..95ed4d0 100644
--- a/lib/nova
+++ b/lib/nova
@@ -509,6 +509,10 @@
configure_cinder_access
fi
+ if is_service_enabled manila; then
+ configure_manila_access
+ fi
+
if [ -n "$NOVA_STATE_PATH" ]; then
iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"
iniset $NOVA_CONF oslo_concurrency lock_path "$NOVA_STATE_PATH"
@@ -654,6 +658,18 @@
fi
}
+# Configure access to manila.
+function configure_manila_access {
+ iniset $NOVA_CONF manila os_region_name "$REGION_NAME"
+ iniset $NOVA_CONF manila auth_type "password"
+ iniset $NOVA_CONF manila auth_url "$KEYSTONE_SERVICE_URI"
+ iniset $NOVA_CONF manila username nova
+ iniset $NOVA_CONF manila password "$SERVICE_PASSWORD"
+ iniset $NOVA_CONF manila user_domain_name "$SERVICE_DOMAIN_NAME"
+ iniset $NOVA_CONF manila project_name "$SERVICE_TENANT_NAME"
+ iniset $NOVA_CONF manila project_domain_name "$SERVICE_DOMAIN_NAME"
+}
+
function configure_console_compute {
# If we are running multiple cells (and thus multiple console proxies) on a
# single host, we offset the ports to avoid collisions. We need to
diff --git a/tools/build_venv.sh b/tools/build_venv.sh
index cfa39a8..a439163 100755
--- a/tools/build_venv.sh
+++ b/tools/build_venv.sh
@@ -38,7 +38,7 @@
fi
# Build new venv
-virtualenv $VENV_DEST
+python$PYTHON3_VERSION -m venv --system-site-packages $VENV_DEST
# Install modern pip
PIP_VIRTUAL_ENV=$VENV_DEST pip_install -U pip