DNS overrides for service endpoints

Change-Id: I0a8132a250f91c1eca4634f903a4d49c5e5ed223
This commit is contained in:
Kaspars Skels 2018-08-30 15:02:54 -05:00
parent 59d538e639
commit 25428d6b67
1 changed files with 177 additions and 264 deletions

View File

@ -10,107 +10,93 @@ metadata:
abstract: false
layer: site
storagePolicy: cleartext
# substitutions:
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .ucp.identity.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .ceph.object_store.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ceph.object_store.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ceph.object_store.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ceph.object_store.host_fqdn_override.public.tls.key
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ucp.identity.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ucp.identity.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ucp.identity.host_fqdn_override.public.tls.key
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.tls.key
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.ingress_domain
dest:
- path: .ucp.identity.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ucp.shipyard.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .ceph.ceph_object_store.host_fqdn_override.public.host
pattern: DOMAIN
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ceph.object_store.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ceph.object_store.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ceph.object_store.host_fqdn_override.public.tls.key
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ucp.identity.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ucp.identity.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ucp.identity.host_fqdn_override.public.tls.key
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.tls.crt
# - src:
# schema: deckhand/CertificateAuthority/v1
# name: ingress-ca
# path: .
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.tls.ca
# - src:
# schema: deckhand/CertificateKey/v1
# name: ingress-key
# path: .
# dest:
# path: .ucp.shipyard.host_fqdn_override.public.tls.key
data:
ucp:
identity:
@ -121,8 +107,8 @@ data:
public: keystone
host_fqdn_override:
default: null
# public:
# host: iam.DOMAIN
public:
host: iam.DOMAIN
path:
default: /v3
scheme:
@ -289,8 +275,8 @@ data:
# public: https
host_fqdn_override:
default: null
# public:
# host: shipyard.DOMAIN
public:
host: shipyard.DOMAIN
airflow_web:
name: airflow-web
hosts:
@ -327,8 +313,8 @@ data:
public: radosgw
host_fqdn_override:
default: null
# public:
# host: object-store.DOMAIN
public:
host: object-store.DOMAIN
path:
default: /swift/v1
scheme:
@ -346,8 +332,8 @@ data:
public: radosgw
host_fqdn_override:
default: null
# public:
# host: object-store.DOMAIN
public:
host: object-store.DOMAIN
path:
default: /auth/v1.0
scheme:
@ -388,21 +374,41 @@ metadata:
abstract: false
layer: site
storagePolicy: cleartext
# substitutions:
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.object_store.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.ceph_object_store.host_fqdn_override.public.host
# pattern: DOMAIN
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.ingress_domain
dest:
- path: .osh.object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.ceph_object_store.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.image.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.cloudformation.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.orchestration.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.compute.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.compute_novnc_proxy.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.placement.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.network.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.identity.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.dashboard.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.volume.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.volumev2.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh.volumev3.host_fqdn_override.public.host
pattern: DOMAIN
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
@ -440,90 +446,6 @@ metadata:
# dest:
# path: .osh.ceph_object_store.host_fqdn_override.public.tls.key
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.image.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.cloudformation.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.orchestration.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.compute.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.compute_novnc_proxy.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.placement.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.network.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.identity.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.dashboard.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.volume.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.volumev2.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh.volumev3.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
# path: .
@ -749,8 +671,8 @@ data:
public: radosgw
host_fqdn_override:
default: null
# public:
# host: object-store.DOMAIN
public:
host: object-store.DOMAIN
path:
default: /swift/v1/KEY_$(tenant_id)s
scheme:
@ -768,8 +690,8 @@ data:
public: radosgw
host_fqdn_override:
default: null
# public:
# host: object-store.DOMAIN
public:
host: object-store.DOMAIN
path:
default: /auth/v1.0
scheme:
@ -835,8 +757,8 @@ data:
public: keystone
host_fqdn_override:
default: null
# public:
# host: identity.DOMAIN
public:
host: identity.DOMAIN
path:
default: /v3
scheme:
@ -881,8 +803,8 @@ data:
public: glance
host_fqdn_override:
default: null
# public:
# host: image.DOMAIN
public:
host: image.DOMAIN
path:
default: null
scheme:
@ -940,8 +862,8 @@ data:
public: cinder
host_fqdn_override:
default: null
# public:
# host: volume.DOMAIN
public:
host: volume.DOMAIN
path:
default: "/v1/%(tenant_id)s"
scheme:
@ -958,8 +880,8 @@ data:
public: cinder
host_fqdn_override:
default: null
# public:
# host: volume.DOMAIN
public:
host: volume.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
@ -976,8 +898,8 @@ data:
public: cinder
host_fqdn_override:
default: null
# public:
# host: volume.DOMAIN
public:
host: volume.DOMAIN
path:
default: "/v3/%(tenant_id)s"
scheme:
@ -1020,8 +942,8 @@ data:
public: heat
host_fqdn_override:
default: null
# public:
# host: orchestration.DOMAIN
public:
host: orchestration.DOMAIN
path:
default: "/v1/%(project_id)s"
scheme:
@ -1038,8 +960,8 @@ data:
public: cloudformation
host_fqdn_override:
default: null
# public:
# host: cloudformation.DOMAIN
public:
host: cloudformation.DOMAIN
path:
default: /v1
scheme:
@ -1098,8 +1020,8 @@ data:
public: neutron
host_fqdn_override:
default: null
# public:
# host: network.DOMAIN
public:
host: network.DOMAIN
path:
default: null
scheme:
@ -1142,8 +1064,8 @@ data:
public: nova
host_fqdn_override:
default: null
# public:
# host: compute.DOMAIN
public:
host: compute.DOMAIN
path:
default: "/v2/%(tenant_id)s"
scheme:
@ -1177,8 +1099,8 @@ data:
public: novncproxy
host_fqdn_override:
default: null
# public:
# host: nova-novncproxy.DOMAIN
public:
host: nova-novncproxy.DOMAIN
path:
default: /vnc_auto.html
scheme:
@ -1208,8 +1130,8 @@ data:
public: placement
host_fqdn_override:
default: null
# public:
# host: placement.DOMAIN
public:
host: placement.DOMAIN
path:
default: /
scheme:
@ -1226,8 +1148,8 @@ data:
public: horizon
host_fqdn_override:
default: null
# public:
# host: dashboard.DOMAIN
public:
host: dashboard.DOMAIN
path:
default: null
scheme:
@ -1247,28 +1169,19 @@ metadata:
abstract: false
layer: site
storagePolicy: cleartext
# substitutions:
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh_infra.kibana.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh_infra.grafana.host_fqdn_override.public.host
# pattern: DOMAIN
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .dns.ingress_domain
# dest:
# path: .osh_infra.nagios.host_fqdn_override.public.host
# pattern: DOMAIN
substitutions:
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .dns.ingress_domain
dest:
- path: .osh_infra.kibana.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh_infra.grafana.host_fqdn_override.public.host
pattern: DOMAIN
- path: .osh_infra.nagios.host_fqdn_override.public.host
pattern: DOMAIN
# - src:
# schema: deckhand/Certificate/v1
# name: ingress-crt
@ -1418,8 +1331,8 @@ data:
public: grafana
host_fqdn_override:
default: null
# public:
# host: grafana.DOMAIN
public:
host: grafana.DOMAIN
path:
default: null
scheme:
@ -1453,8 +1366,8 @@ data:
public: kibana
host_fqdn_override:
default: null
# public:
# host: kibana.DOMAIN
public:
host: kibana.DOMAIN
path:
default: null
scheme:
@ -1542,8 +1455,8 @@ data:
public: nagios
host_fqdn_override:
default: null
# public:
# host: nagios.DOMAIN
public:
host: nagios.DOMAIN
path:
default: null
scheme: