Make the CloudDomain defaults match the doc strings

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

diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index 8b695ff..34f10a2 100644 (file)
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -66,6 +66,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain

diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index f7e29b7..0854330 100644 (file)
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -72,6 +72,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain

diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 4d77d6d..070f19c 100644 (file)
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -87,6 +87,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain

diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index b1433b0..3fc691a 100644 (file)
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -101,6 +101,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain

diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index d7681d1..be638c5 100644 (file)
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -66,6 +66,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 5b419f8..ad5e479 100644 (file)
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -72,6 +72,7 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
+    default: 'localdomain'
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain