Merge c1d2feb into 7b91303

Author: liningone

kvmagent/kvmagent/plugins/vm_plugin.py

@@ -3331,7 +3331,9 @@ def _create_ceph_secret_key(userKey, uuid):
         try:
             o = shell.call("virsh secret-define %s" % spath)
             o = o.strip(' \n\t\r')
-            _, generateuuid, _ = o.split()
+            uuidReg = "[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
+            pattern = re.compile(uuidReg)
+            generateuuid = pattern.findall(o)[0]
             shell.call('virsh secret-set-value %s %s' % (generateuuid, userKey))
         finally:
             os.remove(spath)