When encrypted ensure we are using a file that ends in .crypt and use the pw tool for the uploader

anvil/passwords.py

@@ -47,8 +47,10 @@ class FixedCryptedFileKeyring(CryptedFileKeyring):
 
 class KeyringProxy(object):
     def __init__(self, path, keyring_encrypted=False, enable_prompt=True, random_on_empty=True):
-        self.path = path
         self.keyring_encrypted = keyring_encrypted
+        if self.keyring_encrypted and not path.endswith(".crypt"):
+            path = "%s.crypt" % (path)
+        self.path = path
         if keyring_encrypted:
             self.ring = FixedCryptedFileKeyring()
         else:

tools/img-uploader.py

@@ -19,21 +19,16 @@ if os.path.exists(os.path.join(possible_topdir,
 from anvil import log as logging
 from anvil.components.helpers import glance
 
+from anvil import passwords
+
 
 def get_password(user):
-    pw = None
-    while pw is None:
-        prompt = "Please enter the keystone password for %s: " % (user)
-        apw = getpass.getpass(prompt)
-        if len(apw) == 0:
-            print("Empty password not allowed!")
-            continue
-        prompt = "Confirm password: "
-        bpw = getpass.getpass(prompt)
-        if not apw == bpw:
-            print("Passwords do not match!")
-        else:
-            pw = apw
+    pw_storage = passwords.KeyringProxy(path='/etc/anvil/passwords.cfg')
+    lookup_name = "%s_password" % (user)
+    prompt = "Please enter the keystone password for user %s: " % (user)
+    (exists, pw) = pw_storage.read(lookup_name, prompt)
+    if not exists:
+        pw_storage.save(lookup_name, pw)
     return pw