From 5d8e6b28ae318a6f5927ec632c724b49cde8e5e7 Mon Sep 17 00:00:00 2001
From: Bryan Strassner <strassner.bryan@gmail.com>
Date: Fri, 11 Jan 2019 15:58:57 -0600
Subject: [PATCH] Fix references to olso by correcting them to oslo

Transposed characters in the target replacements in
some of the deployment files can lead to unexpected
results (mostly that defaults are used instead of
overrides)

Since defaults were being used before, the endpoint definition needed to
be redefined to use the expected scheme (amqp) and path (/airflow)

Change-Id: I85a58c7b525e29208957845bf25ffbb0111c8f35
---
 .../charts/osh-infra/osh-infra-mariadb/mariadb.yaml |  2 +-
 .../charts/osh/openstack-mariadb/mariadb.yaml       |  2 +-
 global/software/charts/ucp/core/mariadb.yaml        |  2 +-
 global/software/charts/ucp/shipyard/shipyard.yaml   |  4 ++--
 .../software/config/endpoints.yaml                  | 13 +++++++++++++
 site/airskiff/software/config/endpoints.yaml        | 13 +++++++++++++
 6 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
index 1d90c3ccd..5ef0ded12 100644
--- a/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
+++ b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
@@ -30,7 +30,7 @@ metadata:
         name: osh_infra_endpoints
         path: .osh_infra.oslo_db
       dest:
-        path: .values.endpoints.olso_db
+        path: .values.endpoints.oslo_db
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_infra_endpoints
diff --git a/global/software/charts/osh/openstack-mariadb/mariadb.yaml b/global/software/charts/osh/openstack-mariadb/mariadb.yaml
index 4a75da22e..aa16d674b 100644
--- a/global/software/charts/osh/openstack-mariadb/mariadb.yaml
+++ b/global/software/charts/osh/openstack-mariadb/mariadb.yaml
@@ -33,7 +33,7 @@ metadata:
         name: osh_endpoints
         path: .osh.oslo_db
       dest:
-        path: .values.endpoints.olso_db
+        path: .values.endpoints.oslo_db
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
diff --git a/global/software/charts/ucp/core/mariadb.yaml b/global/software/charts/ucp/core/mariadb.yaml
index 55a5a3568..400a99e43 100644
--- a/global/software/charts/ucp/core/mariadb.yaml
+++ b/global/software/charts/ucp/core/mariadb.yaml
@@ -32,7 +32,7 @@ metadata:
         name: ucp_endpoints
         path: .ucp.oslo_db
       dest:
-        path: .values.endpoints.olso_db
+        path: .values.endpoints.oslo_db
     # Accounts
     - src:
         schema: pegleg/AccountCatalogue/v1
diff --git a/global/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml
index 0ec10ae95..88208a71d 100644
--- a/global/software/charts/ucp/shipyard/shipyard.yaml
+++ b/global/software/charts/ucp/shipyard/shipyard.yaml
@@ -86,9 +86,9 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
-        path: .ucp.oslo_messaging
+        path: .ucp.airflow_oslo_messaging
       dest:
-        path: .values.endpoints.olso_messaging
+        path: .values.endpoints.oslo_messaging
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml
index eb084dbd2..63eb2a7a1 100644
--- a/site/airship-seaworthy/software/config/endpoints.yaml
+++ b/site/airship-seaworthy/software/config/endpoints.yaml
@@ -154,6 +154,19 @@ data:
         api:
           default: 9311
           public: 80
+    airflow_oslo_messaging:
+      namespace: null
+      hosts:
+        default: rabbitmq
+      host_fqdn_override:
+        default: null
+      path: /airflow
+      scheme: amqp
+      port:
+        amqp:
+          default: 5672
+        http:
+          default: 15672
     oslo_messaging:
       namespace: null
       hosts:
diff --git a/site/airskiff/software/config/endpoints.yaml b/site/airskiff/software/config/endpoints.yaml
index 0e34f77b8..f73af3132 100644
--- a/site/airskiff/software/config/endpoints.yaml
+++ b/site/airskiff/software/config/endpoints.yaml
@@ -151,6 +151,19 @@ data:
         api:
           default: 9311
           public: 80
+    airflow_oslo_messaging:
+      namespace: null
+      hosts:
+        default: rabbitmq
+      host_fqdn_override:
+        default: null
+      path: /airflow
+      scheme: amqp
+      port:
+        amqp:
+          default: 5672
+        http:
+          default: 15672
     oslo_messaging:
       namespace: null
       hosts: