Reinstate CloudDomain properties for Controller/Compute roles

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

diff --git a/overcloud.yaml b/overcloud.yaml
index dde5a8c..f194b7e 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -430,6 +430,7 @@ resources:
       resource_def:
         type: OS::TripleO::Controller
         properties:
+          CloudDomain: {get_param: CloudDomain}
           controllerExtraConfig: {get_param: controllerExtraConfig}
           HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
           HorizonSecret: {get_resource: HorizonSecret}
@@ -467,6 +468,7 @@ resources:
       resource_def:
         type: OS::TripleO::Compute
         properties:
+          CloudDomain: {get_param: CloudDomain}
           GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
           KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
           KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index ace9e15..08d66f5 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -71,7 +71,6 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
-    default: ''
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain

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

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

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

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 3553f77..1d451ab 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -78,7 +78,6 @@ parameters:
     constraints:
     - allowed_values: [POLL_SERVER_CFN, POLL_SERVER_HEAT, POLL_TEMP_URL, ZAQAR_MESSAGE]
   CloudDomain:
-    default: ''
     type: string
     description: >
       The DNS domain used for the hosts. This should match the dhcp_domain