openstack/tripleo-heat-templates
Code Issues Proposed changes

Reinstate CloudDomain properties for Controller/Compute roles

Browse Source 
These were removed in https://review.openstack.org/#/c/347050
but it turns out the defaults in the role templates is bad, as
an empty string results in a malformed hosts file fqdn.

So, partially revert that patch so we always pass the global
CloudDomain from overcloud.yaml, accepting the default configured
there, and remove the empty-string defaults in the role templates.

Change-Id: I0ea4190a23488986a3ee9e887328e0e7a03fe3aa
This commit is contained in:
Steven Hardy 2016-08-11 14:04:28 +01:00
parent 05691d2508
commit 44b67ebdeb
6 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud.yaml
View File

@ -430,6 +430,7 @@ resources:
resource_def: resource_def:
type: OS::TripleO::Controller type: OS::TripleO::Controller
properties: properties:
CloudDomain: {get_param: CloudDomain}
controllerExtraConfig: {get_param: controllerExtraConfig} controllerExtraConfig: {get_param: controllerExtraConfig}
HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey} HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
HorizonSecret: {get_resource: HorizonSecret} HorizonSecret: {get_resource: HorizonSecret}
@ -467,6 +468,7 @@ resources:
resource_def: resource_def:
type: OS::TripleO::Compute type: OS::TripleO::Compute
properties: properties:
CloudDomain: {get_param: CloudDomain}
GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]} GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]} KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]} KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}

1
puppet/ceph-storage.yaml
View File

@ -71,7 +71,6 @@ parameters:
constraints: constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE] - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain: CloudDomain:
default: ''
type: string type: string
description: > description: >
The DNS domain used for the hosts. This should match the dhcp_domain The DNS domain used for the hosts. This should match the dhcp_domain

1
puppet/cinder-storage.yaml
View File

@ -73,7 +73,6 @@ parameters:
constraints: constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE] - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain: CloudDomain:
default: ''
type: string type: string
description: > description: >
The DNS domain used for the hosts. This should match the dhcp_domain The DNS domain used for the hosts. This should match the dhcp_domain

1
puppet/compute.yaml
View File

@ -195,7 +195,6 @@ parameters:
constraints: constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE] - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain: CloudDomain:
default: ''
type: string type: string
description: > description: >
The DNS domain used for the hosts. This should match the dhcp_domain The DNS domain used for the hosts. This should match the dhcp_domain

1
puppet/controller.yaml
View File

@ -301,7 +301,6 @@ parameters:
constraints: constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE] - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain: CloudDomain:
default: ''
type: string type: string
description: > description: >
The DNS domain used for the hosts. This should match the dhcp_domain The DNS domain used for the hosts. This should match the dhcp_domain

1
puppet/swift-storage.yaml
View File

@ -78,7 +78,6 @@ parameters:
constraints: constraints:
- allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE] - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
CloudDomain: CloudDomain:
default: ''
type: string type: string
description: > description: >
The DNS domain used for the hosts. This should match the dhcp_domain The DNS domain used for the hosts. This should match the dhcp_domain