Merge "Move remove_uwsgi_config to cleanup_placement"
diff --git a/inc/python b/inc/python
index 9938f98..2e4eff0 100644
--- a/inc/python
+++ b/inc/python
@@ -407,6 +407,12 @@
function lib_installed_from_git {
local name=$1
local safe_name
+ # TODO(mordred) This is a special case for python-openstacksdk, where the
+ # repo name and the pip name do not match. We should either add systemic
+ # support for providing aliases, or we should rename the git repo.
+ if [[ $name == 'python-openstacksdk' ]] ; then
+ name=openstacksdk
+ fi
safe_name=$(python -c "from pkg_resources import safe_name; \
print(safe_name('${name}'))")
# Note "pip freeze" doesn't always work here, because it tries to
diff --git a/lib/cinder b/lib/cinder
index 07f82a1..a966a4b 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -244,6 +244,7 @@
iniset $CINDER_CONF DEFAULT my_ip "$HOST_IP"
iniset $CINDER_CONF key_manager backend cinder.keymgr.conf_key_mgr.ConfKeyManager
+ iniset $CINDER_CONF key_manager fixed_key $(openssl rand -hex 16)
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
local enabled_backends=""
diff --git a/stackrc b/stackrc
index ffe4050..286a04d 100644
--- a/stackrc
+++ b/stackrc
@@ -121,7 +121,7 @@
# base name of the directory from which they are installed. See
# enable_python3_package to edit this variable and use_python3_for to
# test membership.
-export ENABLED_PYTHON3_PACKAGES="nova,glance,cinder,uwsgi,python-openstackclient"
+export ENABLED_PYTHON3_PACKAGES="nova,glance,cinder,uwsgi,python-openstackclient,python-openstacksdk"
# Explicitly list services not to run under Python 3. See
# disable_python3_package to edit this variable.