Browse Source

[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
Bryan Strassner 5 months ago
parent
commit
f7436ddcd1

+ 2
- 2
deployment_files/global/v1.0demo/software/config/endpoints.yaml View File

@@ -3,6 +3,8 @@ schema: pegleg/EndpointCatalogue/v1
3 3
 metadata:
4 4
     schema: metadata/Document/v1
5 5
     name: ucp_endpoints
6
+    labels:
7
+      name: ucp_endpoints
6 8
     layeringDefinition:
7 9
         abstract: false
8 10
         layer: global
@@ -17,7 +19,6 @@ data:
17 19
         internal: keystone-api
18 20
       host_fqdn_override:
19 21
         default: null
20
-        public: keystone.gate.local
21 22
       path:
22 23
         default: /v3
23 24
       scheme:
@@ -169,7 +170,6 @@ data:
169 170
         default: http
170 171
       host_fqdn_override:
171 172
         default: null
172
-        public: shipyard.gate.local
173 173
     airflow_web:
174 174
       name: airflow-web
175 175
       hosts:

+ 26
- 0
deployment_files/site/gate-multinode/software/configs/endpoints.yaml View File

@@ -0,0 +1,26 @@
1
+---
2
+schema: pegleg/EndpointCatalogue/v1
3
+metadata:
4
+    schema: metadata/Document/v1
5
+    name: ucp_endpoints
6
+    replacement: true
7
+    layeringDefinition:
8
+        abstract: false
9
+        layer: site
10
+        parentSelector:
11
+          name: ucp_endpoints
12
+        actions:
13
+          - method: merge
14
+            path: .
15
+    storagePolicy: cleartext
16
+# Override endpoints specified at the global layer, in support of a
17
+# dns server
18
+data:
19
+  ucp:
20
+    identity:
21
+      host_fqdn_override:
22
+        public: keystone.gate.local
23
+    shipyard:
24
+      host_fqdn_override:
25
+        public: shipyard.gate.local
26
+...

Loading…
Cancel
Save