Merge "Fix pre-flight validation undercloud-passwords.conf"

tripleoclient/v1/undercloud_preflight.py

@@ -25,6 +25,8 @@ import psutil
 
 from oslo_config import cfg
 
+from tripleoclient import constants
+
 
 class FailedValidation(Exception):
     pass
@@ -34,7 +36,9 @@ CONF = cfg.CONF
 # We need 8 GB, leave a little room for variation in what 8 GB means on
 # different platforms.
 REQUIRED_MB = 7680
-PASSWORD_PATH = os.path.expanduser('~/undercloud-passwords.conf')
+PASSWORD_PATH = '%s/%s' % (constants.UNDERCLOUD_OUTPUT_DIR,
+                           'undercloud-passwords.conf')
+
 LOG = logging.getLogger(__name__ + ".UndercloudSetup")