diff options
author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-08-17 15:05:41 +0300 |
---|---|---|
committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-08-24 15:03:38 +0300 |
commit | f9dadcafcfa798f20e1ea561c0c75679747bd525 (patch) | |
tree | 6d34a19ccecb6ddc2d9af52475e7240563718c75 /overcloud.yaml | |
parent | 1c8b5fa5d7d633d156e761d21ff60188eb43701f (diff) |
Enable usage of FQDNs for the endpoints
The endpoint map has the capability of using the cloud's name for the
endpoint. This is broken, however, since this has the problem that we
only take into account the overcloud's external endpoint name, which
we then cannot use if we have network-isolation enabled, which is
the most common use-case for real deployments.
So this change proposes the following:
* The external endpoint is still CloudName.
* We can now set different (or the same if we want) names for the
different VIPs of the network.
* Using CLOUDNAME for the endpoint map will get a name for the
appropriate network.
bp tls-via-certmonger
Change-Id: I3e7144653f0a1d783d87e6f638304b297f718929
Diffstat (limited to 'overcloud.yaml')
-rw-r--r-- | overcloud.yaml | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index a4f8fee1..ff23179b 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -16,6 +16,30 @@ parameters: default: overcloud description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org type: string + CloudNameInternal: + default: overcloud.internalapi.localdomain + description: > + The DNS name of this cloud's internal API endpoint. E.g. + 'ci-overcloud.internalapi.tripleo.org'. + type: string + CloudNameStorage: + default: overcloud.storage.localdomain + description: > + The DNS name of this cloud's storage endpoint. E.g. + 'ci-overcloud.storage.tripleo.org'. + type: string + CloudNameStorageManagement: + default: overcloud.storagemgmt.localdomain + description: > + The DNS name of this cloud's storage management endpoint. E.g. + 'ci-overcloud.storagemgmt.tripleo.org'. + type: string + CloudNameManagement: + default: overcloud.management.localdomain + description: > + The DNS name of this cloud's storage management endpoint. E.g. + 'ci-overcloud.management.tripleo.org'. + type: string ControlFixedIPs: default: [] description: Should be used for arbitrary ips. @@ -374,7 +398,12 @@ resources: EndpointMap: type: OS::TripleO::EndpointMap properties: - CloudName: {get_param: CloudName} + CloudEndpoints: + external: {get_param: CloudName} + internal_api: {get_param: CloudNameInternal} + storage: {get_param: CloudNameStorage} + storage_mgmt: {get_param: CloudNameStorageManagement} + management: {get_param: CloudNameManagement} NetIpMap: {get_attr: [VipMap, net_ip_map]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} |