summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <bryan.strassner@gmail.com>2018-10-30 16:03:47 -0500
committerBryan Strassner <bryan.strassner@gmail.com>2018-10-30 16:12:22 -0500
commitf7436ddcd101b1c11976c2b5530509b52c0807ac (patch)
tree4d834ec0c48727a4a92f3ec7e80b471bf11e2998
parente596c3d25ac49850f2e6fbc037258f0f95cb876a (diff)
[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
Notes
Notes (review): Code-Review+2: Scott Hussey <sthussey@att.com> Code-Review+1: Ahmad Mahmoudi <am495p@att.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+1: Dan Crank <dan.no@att.com> Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Workflow+1: Felipe Monteiro <felipe.monteiro@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 31 Oct 2018 00:57:54 +0000 Reviewed-on: https://review.openstack.org/614354 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/config/endpoints.yaml4
-rw-r--r--deployment_files/site/gate-multinode/software/configs/endpoints.yaml26
2 files changed, 28 insertions, 2 deletions
diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index f3389c1..be02e2d 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
3metadata: 3metadata:
4 schema: metadata/Document/v1 4 schema: metadata/Document/v1
5 name: ucp_endpoints 5 name: ucp_endpoints
6 labels:
7 name: ucp_endpoints
6 layeringDefinition: 8 layeringDefinition:
7 abstract: false 9 abstract: false
8 layer: global 10 layer: global
@@ -17,7 +19,6 @@ data:
17 internal: keystone-api 19 internal: keystone-api
18 host_fqdn_override: 20 host_fqdn_override:
19 default: null 21 default: null
20 public: keystone.gate.local
21 path: 22 path:
22 default: /v3 23 default: /v3
23 scheme: 24 scheme:
@@ -169,7 +170,6 @@ data:
169 default: http 170 default: http
170 host_fqdn_override: 171 host_fqdn_override:
171 default: null 172 default: null
172 public: shipyard.gate.local
173 airflow_web: 173 airflow_web:
174 name: airflow-web 174 name: airflow-web
175 hosts: 175 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 0000000..e8448d0
--- /dev/null
+++ b/deployment_files/site/gate-multinode/software/configs/endpoints.yaml
@@ -0,0 +1,26 @@
1---
2schema: pegleg/EndpointCatalogue/v1
3metadata:
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
18data:
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... \ No newline at end of file