diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-11 14:04:28 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-08-11 14:04:28 +0100 |
| commit | 44b67ebdeb179af66dad78c2c54eb07723f46d4d (patch) | |
| tree | 4402a7ecf730e1da16b98a5067aca3aadaf3c34c /puppet | |
| parent | 05691d25087e83066fbf5caadd022dca4c7131f2 (diff) | |
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
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 1 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index ace9e151..08d66f5c 100644 --- 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 e4df6aed..ba84fb77 100644 --- 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 e029c605..0fc5345c 100644 --- 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 5734ce0a..779aa8a4 100644 --- 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 3553f77a..1d451ab2 100644 --- 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 |