From d315c1fa6e7e175f6e76471a83819cb7dfd7dcb0 Mon Sep 17 00:00:00 2001
From: Ryan Brady <rbrady@redhat.com>
Date: Thu, 27 Oct 2016 09:42:59 -0400
Subject: [PATCH] Fix AdminPassword for overcloud during upgrades

In newton the password generation moved to a workflow.  In the case
when an overcloud is upgraded from mitaka to newton, the previous
OS_PASSWORD/AdminPassword should be respected if found in the
environment.

This is a one cycle fix that should be immediately considered
as deprecated and will be removed in ocata as upgrades from
newton to ocata should both use the password generation workflow.

Closes-Bug: 1638003
Change-Id: I05dbbe61f3ff8da182739aa41512b76fc86cb7a6
backport: newton
---

diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py
index 6009672..c2ee699 100644
--- a/tripleoclient/utils.py
+++ b/tripleoclient/utils.py
@@ -420,6 +420,14 @@
     global __password_cache
     if __password_cache is None:
         __password_cache = generate_overcloud_passwords(clients, plan_name)
+        # NOTE (rbrady): In the case of an upgrade from mitaka -> newton
+        # the current AdminPassword should remain the same.  This fix
+        # should be considered immediately deprecated and will be removed
+        # later in ocata as newton -> ocata upgrades should both use the
+        # passwords generated in the workflow.
+        overcloud_admin_password = os.environ.get('OS_PASSWORD')
+        if overcloud_admin_password:
+            __password_cache['AdminPassword'] = overcloud_admin_password
     return __password_cache[pass_name]