From 13b04b6bb05d4a4c2ef7d5d8213c7c964f0a7054 Mon Sep 17 00:00:00 2001
From: Evgeny L <eli@mirantis.com>
Date: Mon, 31 Dec 2018 21:36:42 +0000
Subject: [PATCH] Fix Shipyard and Drydock user overrides

* Drydock: typo for user path `drydock.user` -> `auth.drydock`.
* Drydock: add an override for admin user.
* Shipyard: add an override for "shipyard" user.

Change-Id: I0e1f99db816ccf41085cca24637db40e0641a7b6
---
 .../software/charts/ucp/drydock/drydock.yaml   |  8 +++++++-
 .../software/charts/ucp/shipyard/shipyard.yaml | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/global/software/charts/ucp/drydock/drydock.yaml b/global/software/charts/ucp/drydock/drydock.yaml
index 9fda08092..d0c9a4f08 100644
--- a/global/software/charts/ucp/drydock/drydock.yaml
+++ b/global/software/charts/ucp/drydock/drydock.yaml
@@ -99,12 +99,18 @@ metadata:
       dest:
         path: .values.endpoints.postgresql.path
         pattern: DB_NAME
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: ucp_service_accounts
+        path: .ucp.keystone.admin
+      dest:
+        path: .values.endpoints.identity.auth.admin
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: ucp_service_accounts
         path: .ucp.drydock.keystone
       dest:
-        path: .values.endpoints.identity.drydock.user
+        path: .values.endpoints.identity.auth.drydock
 
     # Secrets
     - dest:
diff --git a/global/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml
index 263b99bee..0ec10ae95 100644
--- a/global/software/charts/ucp/shipyard/shipyard.yaml
+++ b/global/software/charts/ucp/shipyard/shipyard.yaml
@@ -137,12 +137,6 @@ metadata:
         path: .ucp.postgres.admin
       dest:
         path: .values.endpoints.postgresql_airflow_celery_db.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ucp.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: ucp_service_accounts
@@ -173,6 +167,18 @@ metadata:
         path: .ucp.airflow.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: ucp_service_accounts
+        path: .ucp.keystone.admin
+      dest:
+        path: .values.endpoints.identity.auth.admin
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: ucp_service_accounts
+        path: .ucp.shipyard.keystone
+      dest:
+        path: .values.endpoints.identity.auth.shipyard
 
     # Secrets
     - dest: