openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Introduce domain configuration through parameter"

Browse Source
This commit is contained in:
Jenkins 2015-12-03 09:06:03 +00:00 committed by Gerrit Code Review
commit 0072701294
6 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
overcloud-without-mergepy.yaml
View File

@ -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

10
puppet/ceph-storage.yaml
View File

@ -59,6 +59,13 @@ parameters:
description: >
Heat action when to apply network configuration changes
default: ['CREATE']
CloudDomain:
default: ''
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
configured in the Undercloud neutron. Defaults to localdomain.
resources:
CephStorage:
@ -214,9 +221,10 @@ outputs:
hosts_entry:
value:
str_replace:
template: "IP HOST.localdomain HOST"
template: "IP HOST.DOMAIN HOST"
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephStorageHostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [CephStorage, name]}
nova_server_resource:
description: Heat resource handle for the ceph storage server

10
puppet/cinder-storage.yaml
View File

@ -112,6 +112,13 @@ parameters:
description: >
Heat action when to apply network configuration changes
default: ['CREATE']
CloudDomain:
default: ''
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
configured in the Undercloud neutron. Defaults to localdomain.
resources:
BlockStorage:
@ -288,9 +295,10 @@ outputs:
hosts_entry:
value:
str_replace:
template: "IP HOST.localdomain HOST"
template: "IP HOST.DOMAIN HOST"
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, BlockStorageHostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [BlockStorage, name]}
nova_server_resource:
description: Heat resource handle for the block storage server

10
puppet/compute.yaml
View File

@ -290,6 +290,13 @@ parameters:
description: >
Heat action when to apply network configuration changes
default: ['CREATE']
CloudDomain:
default: ''
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
configured in the Undercloud neutron. Defaults to localdomain.
resources:
@ -614,9 +621,10 @@ outputs:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
template: "IP HOST.localdomain HOST"
template: "IP HOST.DOMAIN HOST"
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ComputeHostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [NovaCompute, name]}
nova_server_resource:
description: Heat resource handle for the Nova compute server

9
puppet/controller.yaml
View File

@ -628,6 +628,12 @@ parameters:
NodeIndex:
type: number
default: 0
CloudDomain:
default: ''
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
configured in the Undercloud neutron. Defaults to localdomain.
resources:
@ -1407,9 +1413,10 @@ outputs:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
template: IP HOST.localdomain HOST CLOUDNAME
template: IP HOST.DOMAIN HOST CLOUDNAME
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ControllerHostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [Controller, name]}
CLOUDNAME: {get_param: CloudName}
nova_server_resource:

10
puppet/swift-storage.yaml
View File

@ -82,6 +82,13 @@ parameters:
description: >
Heat action when to apply network configuration changes
default: ['CREATE']
CloudDomain:
default: ''
type: string
description: >
The DNS domain used for the hosts. This should match the dhcp_domain
configured in the Undercloud neutron. Defaults to localdomain.
resources:
@ -249,9 +256,10 @@ outputs:
hosts_entry:
value:
str_replace:
template: "IP HOST.localdomain HOST"
template: "IP HOST.DOMAIN HOST"
params:
IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ObjectStorageHostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}
HOST: {get_attr: [SwiftStorage, name]}
nova_server_resource:
description: Heat resource handle for the swift storage server