From 85f49431a95e242c0a46c68d2f4d8b42854f6657 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Sat, 28 May 2016 05:05:19 -0400 Subject: [PATCH] Fix restack problem with libvirt secret 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 --- devstack/lib/ceph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/lib/ceph b/devstack/lib/ceph index 55d41dca..7409bee5 100644 --- a/devstack/lib/ceph +++ b/devstack/lib/ceph @@ -167,7 +167,7 @@ function _undefine_virsh_secret { is_ceph_enabled_for_service nova; then local virsh_uuid 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 }