From f7436ddcd101b1c11976c2b5530509b52c0807ac Mon Sep 17 00:00:00 2001
From: Bryan Strassner <bryan.strassner@gmail.com>
Date: Tue, 30 Oct 2018 16:03:47 -0500
Subject: [PATCH] [FIX] Update the global endpoints for base case

Keystone and Shipyard globally defined host_fqdn_override that utilizes
a DNS server set up for multinode gates. This change moves these to be
overridden/merged in at the site layer instead, allowing the global to
be usable for the single-node Airship-in-a-bottle demo.

Change-Id: I83c9a8f1cdda7017882ca0253ce07d48fb684e16
---
 .../v1.0demo/software/config/endpoints.yaml   |  4 +--
 .../software/configs/endpoints.yaml           | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 deployment_files/site/gate-multinode/software/configs/endpoints.yaml

diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index f3389c19..be02e2dd 100644
--- a/deployment_files/global/v1.0demo/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
@@ -3,6 +3,8 @@ schema: pegleg/EndpointCatalogue/v1
 metadata:
     schema: metadata/Document/v1
     name: ucp_endpoints
+    labels:
+      name: ucp_endpoints
     layeringDefinition:
         abstract: false
         layer: global
@@ -17,7 +19,6 @@ data:
         internal: keystone-api
       host_fqdn_override:
         default: null
-        public: keystone.gate.local
       path:
         default: /v3
       scheme:
@@ -169,7 +170,6 @@ data:
         default: http
       host_fqdn_override:
         default: null
-        public: shipyard.gate.local
     airflow_web:
       name: airflow-web
       hosts:
diff --git a/deployment_files/site/gate-multinode/software/configs/endpoints.yaml b/deployment_files/site/gate-multinode/software/configs/endpoints.yaml
new file mode 100644
index 00000000..e8448d01
--- /dev/null
+++ b/deployment_files/site/gate-multinode/software/configs/endpoints.yaml
@@ -0,0 +1,26 @@
+---
+schema: pegleg/EndpointCatalogue/v1
+metadata:
+    schema: metadata/Document/v1
+    name: ucp_endpoints
+    replacement: true
+    layeringDefinition:
+        abstract: false
+        layer: site
+        parentSelector:
+          name: ucp_endpoints
+        actions:
+          - method: merge
+            path: .
+    storagePolicy: cleartext
+# Override endpoints specified at the global layer, in support of a
+# dns server
+data:
+  ucp:
+    identity:
+      host_fqdn_override:
+        public: keystone.gate.local
+    shipyard:
+      host_fqdn_override:
+        public: shipyard.gate.local
+...
\ No newline at end of file