From 862b28afe4157d483f32a10fff9e4a0ff2894b77 Mon Sep 17 00:00:00 2001
From: Alexander Noskov <anoskov@mirantis.com>
Date: Thu, 27 Jun 2019 12:04:00 -0500
Subject: [PATCH] Uplift Horizon and fix Keystone password for Horizon chart.

Change-Id: Ib5dca5f1f90209af56304f69d38d821c7a5dac22
---
 global/software/charts/osh/openstack-horizon/horizon.yaml | 6 ++++++
 global/software/config/versions.yaml                      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/global/software/charts/osh/openstack-horizon/horizon.yaml b/global/software/charts/osh/openstack-horizon/horizon.yaml
index 7341afdf2..f9685b237 100644
--- a/global/software/charts/osh/openstack-horizon/horizon.yaml
+++ b/global/software/charts/osh/openstack-horizon/horizon.yaml
@@ -69,6 +69,12 @@ metadata:
         pattern: DB_NAME
 
     # Secrets
+    - dest:
+        path: .values.endpoints.identity.auth.admin.password
+      src:
+        schema: deckhand/Passphrase/v1
+        name: osh_keystone_admin_password
+        path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.keystone.password
       src:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 63d00e764..9ab53153e 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -146,12 +146,12 @@ data:
         type: git
       horizon:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 66ba0be81c66c20b5ffae709358970d5937a0202
+        reference: 5ad45700f4a3287d7f55a6f5d75777b3ae744030
         subpath: horizon
         type: git
       horizon-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
+        reference: 1f1482bcb71cd3483c6df3ac4bab09653ed6a2e1
         subpath: helm-toolkit
         type: git
       ingress: