openstack/devstack-plugin-ceph
Code Issues Proposed changes

Fix restack problem with libvirt secret

Browse Source 
Restacking with ceph plugin fails when trying to install
the cinder user's ceph authorization key in libvirt's list
of secrets because there is already a secret in that list
with the same uuid.  The function _undefine_virsh_secret
is run on cleanup and should have removed that key from
the libvirt secret list.

Fix a typo in the variable name for the uuid that identifies
the authorization key in the secret list so that the
cleanup routine removes the key as intended.

Closes-Bug: #1570665

Change-Id: I19d2c20979dca49d73c427c5b1413229ff39f394
This commit is contained in:
Tom Barron
2016-05-28 05:05:19 -04:00
parent 5e83890342
commit 85f49431a9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ceph
View File

@@ -167,7 +167,7 @@ function _undefine_virsh_secret {
is_ceph_enabled_for_service nova; then is_ceph_enabled_for_service nova; then
local virsh_uuid local virsh_uuid
virsh_uuid=$(sudo virsh secret-list | awk '/^ ?[0-9a-z]/ { print $1 }') virsh_uuid=$(sudo virsh secret-list | awk '/^ ?[0-9a-z]/ { print $1 }')
sudo virsh secret-undefine ${uuid} &>/dev/null sudo virsh secret-undefine ${virsh_uuid} &>/dev/null
fi fi
} }