[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
This commit is contained in:
Bryan Strassner 2018-10-30 16:03:47 -05:00
parent e596c3d25a
commit f7436ddcd1
2 changed files with 28 additions and 2 deletions

View File

@ -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:

View File

@ -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
...