openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Generate VIP info for ctlplane VIP, not management"

Browse Source
This commit is contained in:
Jenkins 2016-09-09 18:53:07 +00:00 committed by Gerrit Code Review
commit 3cc34744f1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
overcloud.yaml
View File

@ -34,8 +34,8 @@ parameters:
The DNS name of this cloud's storage management endpoint. E.g.
'ci-overcloud.storagemgmt.tripleo.org'.
type: string
CloudNameManagement:
default: overcloud.management.localdomain
CloudNameCtlplane:
default: overcloud.ctlplane.localdomain
description: >
The DNS name of this cloud's storage management endpoint. E.g.
'ci-overcloud.management.tripleo.org'.
@ -386,7 +386,7 @@ resources:
internal_api: {get_param: CloudNameInternal}
storage: {get_param: CloudNameStorage}
storage_mgmt: {get_param: CloudNameStorageManagement}
management: {get_param: CloudNameManagement}
ctlplane: {get_param: CloudNameCtlplane}
NetIpMap: {get_attr: [VipMap, net_ip_map]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
@ -658,7 +658,7 @@ resources:
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}
cloud_name_ctlplane: {get_param: CloudNameCtlplane}
hosts:
- list_join:
- '\n'

4
puppet/all-nodes-config.yaml
View File

@ -10,7 +10,7 @@ parameters:
type: string
cloud_name_storage_mgmt:
type: string
cloud_name_management:
cloud_name_ctlplane:
type: string
hosts:
type: comma_delimited_list
@ -209,7 +209,7 @@ resources:
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}
cloud_name_ctlplane: {get_param: cloud_name_ctlplane}
outputs:
config_id:

6
puppet/services/vip-hosts.yaml
View File

@ -47,10 +47,10 @@ outputs:
ip: "%{hiera('storage_mgmt_virtual_ip')}"
ensure: present
comment: FQDN of the storage mgmt VIP
management:
name: "%{hiera('cloud_name_management')}"
ctlplane:
name: "%{hiera('cloud_name_ctlplane')}"
ip: "%{hiera('controller_virtual_ip')}"
ensure: present
comment: FQDN of the management VIP
comment: FQDN of the ctlplane VIP
step_config: |
include ::tripleo::vip_hosts