diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-09-06 10:03:00 +0300 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-09-07 03:06:30 +0000 |
| commit | 29329881269cb204f32dc1aa61a5d74db784f379 (patch) | |
| tree | 38d1552efbe70292964cecdd0f4db3f0dffc5cc4 | |
| parent | 87f1f7d26abbc65f3095faa28b9e1f62d96ff0ee (diff) | |
Add VIP names to allNodesConfig
The nodes need to be aware of the fqdn's for the specific endpoints
in the cloud. This could be either to set the entries in /etc/hosts
or to select an appropriate hostname for a certificate to be
generated.
bp tls-via-certmonger
Change-Id: I9b4645b937a344f46ec18a9a68c5afa2bc5206d0
| -rw-r--r-- | overcloud.yaml | 5 | ||||
| -rw-r--r-- | puppet/all-nodes-config.yaml | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 0258b0be..38b7b6ea 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -656,6 +656,11 @@ resources: allNodesConfig: type: OS::TripleO::AllNodes::SoftwareConfig properties: + cloud_name_external: {get_param: CloudName} + cloud_name_internal_api: {get_param: CloudNameInternal} + cloud_name_storage: {get_param: CloudNameStorage} + cloud_name_storage_mgmt: {get_param: CloudNameStorageManagement} + cloud_name_management: {get_param: CloudNameManagement} hosts: - list_join: - '\n' diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 61dcc2c1..69bb1935 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -2,6 +2,16 @@ heat_template_version: 2016-10-14 description: 'All Nodes Config for Puppet' parameters: + cloud_name_external: + type: string + cloud_name_internal_api: + type: string + cloud_name_storage: + type: string + cloud_name_storage_mgmt: + type: string + cloud_name_management: + type: string hosts: type: comma_delimited_list # FIXME(shardy) this can be comma_delimited_list when @@ -168,6 +178,11 @@ resources: tripleo::keepalived::storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]} tripleo::keepalived::redis_virtual_ip: {get_param: RedisVirtualIP} tripleo::redis_notification::haproxy_monitor_ip: {get_param: [NetVipMap, ctlplane]} + cloud_name_external: {get_param: cloud_name_external} + cloud_name_internal_api: {get_param: cloud_name_internal_api} + cloud_name_storage: {get_param: cloud_name_storage} + cloud_name_storage_mgmt: {get_param: cloud_name_storage_mgmt} + cloud_name_management: {get_param: cloud_name_management} outputs: config_id: |