openstack/tripleo-heat-templates
Code Issues Proposed changes

Make the CloudDomain defaults match the doc strings

Browse Source 
Not having the default easily accessible is causing issues for the UI,
as it cannot guess at it and can accidentally overwrite the value with
an empty string (the expected default when unset). The default is
already helpfully spelled out in the doc string for each file, this
updates the parameter to match it.

Change-Id: Ic284f9904e8f1d01cc717d59a0759f679d94106d
Closes-Bug: #1643670
This commit is contained in:
Julie Pichon 2016-11-22 20:39:33 +00:00
parent 2fc81bef2f
commit 0ca8dab4cb
6 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/blockstorage-role.yaml
View File

@ -66,6 +66,7 @@ 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: 'localdomain'
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/cephstorage-role.yaml
View File

@ -72,6 +72,7 @@ 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: 'localdomain'
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-role.yaml
View File

@ -87,6 +87,7 @@ 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: 'localdomain'
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-role.yaml
View File

@ -101,6 +101,7 @@ 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: 'localdomain'
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/objectstorage-role.yaml
View File

@ -66,6 +66,7 @@ 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: 'localdomain'
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/role.role.j2.yaml
View File

@ -72,6 +72,7 @@ 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: 'localdomain'
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