diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-03 09:06:03 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-03 09:06:03 +0000 |
commit | 0072701294a3ca7f26edeec0e09b72fd511b7764 (patch) | |
tree | 736e0142b9c071b90e1247a6b50ba10705b006d0 /overcloud-without-mergepy.yaml | |
parent | c643d4bfccb51f234ed03e7d1d61025edd43622a (diff) | |
parent | 9b43153f9822a38b4f6e29febd14d894e91425b2 (diff) |
Merge "Introduce domain configuration through parameter"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 67c91a4b..67636182 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -283,6 +283,12 @@ parameters: description: The user password for SNMPd with readonly rights running on all Overcloud nodes type: string hidden: true + CloudDomain: + default: 'localdomain' + type: string + description: > + The DNS domain used for the hosts. This should match the dhcp_domain + configured in the Undercloud neutron. Defaults to localdomain. # Controller-specific params AdminToken: @@ -813,6 +819,7 @@ resources: CinderEnableIscsiBackend: {get_param: CinderEnableIscsiBackend} CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend} CloudName: {get_param: CloudName} + CloudDomain: {get_param: CloudDomain} ControlVirtualInterface: {get_param: ControlVirtualInterface} ControllerExtraConfig: {get_param: controllerExtraConfig} Debug: {get_param: Debug} @@ -990,6 +997,7 @@ resources: template: {get_param: ComputeHostnameFormat} params: '%stackname%': {get_param: 'OS::stack_name'} + CloudDomain: {get_param: CloudDomain} BlockStorage: type: OS::Heat::ResourceGroup @@ -1027,6 +1035,7 @@ resources: MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]} ExtraConfig: {get_param: ExtraConfig} BlockStorageExtraConfig: {get_param: BlockStorageExtraConfig} + CloudDomain: {get_param: CloudDomain} ObjectStorage: type: OS::Heat::ResourceGroup @@ -1055,6 +1064,7 @@ resources: '%stackname%': {get_param: 'OS::stack_name'} ExtraConfig: {get_param: ExtraConfig} ObjectStorageExtraConfig: {get_param: ObjectStorageExtraConfig} + CloudDomain: {get_param: CloudDomain} CephStorage: type: OS::Heat::ResourceGroup @@ -1078,6 +1088,7 @@ resources: '%stackname%': {get_param: 'OS::stack_name'} ExtraConfig: {get_param: ExtraConfig} CephStorageExtraConfig: {get_param: CephStorageExtraConfig} + CloudDomain: {get_param: CloudDomain} ControllerIpListMap: type: OS::TripleO::Network::Ports::NetIpListMap |