Merge "Reuse method to convert key to passphrase"

2015-11-18 22:34:50 +00:00
parent 3f9ec06263 08e16aa92c
commit 6004b9c802
1 changed files with 1 additions and 0 deletions
--- a/nova/volume/encryptors/cryptsetup.py
+++ b/nova/volume/encryptors/cryptsetup.py
@@ -53,6 +53,7 @@ class CryptsetupEncryptor(base.VolumeEncryptor):
        self.dev_path = os.path.realpath(self.symlink_path)

    def _get_passphrase(self, key):
+        """Convert raw key to string."""
        return ''.join(hex(x).replace('0x', '') for x in key)

    def _open_volume(self, passphrase, **kwargs):