diff options
| -rw-r--r-- | overcloud.yaml | 2 | ||||
| -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 |
6 files changed, 2 insertions, 5 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index dde5a8c3..f194b7ed 100644 --- 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 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 |