From 68748df07e5f0ae65817d2a2bf54de266033a61e Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Mon, 24 Sep 2018 19:45:07 -0500 Subject: [PATCH] Set Keystone admin endpoint to match public Change-Id: I1f82cd65fb21cb6a8147ffdc68b0da9197f3fdf7 --- .../schemas/pegleg/EndpointCatalogue/v1.yaml | 19 +++++++++++++++++++ .../software/config/endpoints.yaml | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/global/schemas/pegleg/EndpointCatalogue/v1.yaml b/global/schemas/pegleg/EndpointCatalogue/v1.yaml index 776e4270b..c48ba7bcb 100644 --- a/global/schemas/pegleg/EndpointCatalogue/v1.yaml +++ b/global/schemas/pegleg/EndpointCatalogue/v1.yaml @@ -77,6 +77,25 @@ data: type: string additionalProperties: type: string + admin: + oneOf: + - type: string + - type: "null" + - type: object + properties: + host: + type: string + tls: + type: object + properties: + crt: + type: string + ca: + type: string + key: + type: string + additionalProperties: + type: string internal: oneOf: - type: string diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml index 3f67f8372..acdaae36a 100644 --- a/site/airship-seaworthy/software/config/endpoints.yaml +++ b/site/airship-seaworthy/software/config/endpoints.yaml @@ -401,6 +401,8 @@ metadata: pattern: DOMAIN - path: .osh.identity.host_fqdn_override.public.host pattern: DOMAIN + - path: .osh.identity.host_fqdn_override.admin.host + pattern: DOMAIN - path: .osh.dashboard.host_fqdn_override.public.host pattern: DOMAIN - path: .osh.volume.host_fqdn_override.public.host @@ -762,6 +764,8 @@ data: default: null public: host: identity.DOMAIN + admin: + host: identity.DOMAIN path: default: /v3 scheme: