Merge "Fix uploading an signed image does not work if private signing key is encrypted"

Zuul · openstack-gerrit · commit 8aed5feab8a5 · 2020-07-08T17:30:38.000Z
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
@@ -440,8 +440,14 @@ def take_action(self, parsed_args):
                         prompt=("Please enter private key password, leave "
                                 "empty if none: "),
                         confirm=False)
+
                     if not pw or len(pw) < 1:
                         pw = None
+                    else:
+                        # load_private_key() requires the password to be
+                        # passed as bytes
+                        pw = pw.encode()
+
                     signer.load_private_key(
                         sign_key_path,
                         password=pw)
diff --git a/releasenotes/notes/fix-story-2007890-0974f3e69f26801e.yaml b/releasenotes/notes/fix-story-2007890-0974f3e69f26801e.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    While uploading a signed image, a private key to sign that image must be
+    specified. The CLI client asks for the password of that private key. Due
+    to wrong encoding handling while using Python 3, the password is not
+    accepted, whether it is correct or not.
