Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bind mount needed cert for haproxy"
[apex-tripleo-heat-templates.git]
/
puppet
/
blockstorage-role.yaml
diff --git
a/puppet/blockstorage-role.yaml
b/puppet/blockstorage-role.yaml
index
df756b4
..
f28f606
100644
(file)
--- a/
puppet/blockstorage-role.yaml
+++ b/
puppet/blockstorage-role.yaml
@@
-69,8
+69,8
@@
parameters:
default: 'localdomain'
type: string
description: >
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
.
+ The DNS domain used for the hosts. This
must match the
+
overcloud_domain_name configured on the undercloud
.
BlockStorageServerMetadata:
default: {}
description: >
BlockStorageServerMetadata:
default: {}
description: >
@@
-142,6
+142,7
@@
parameters:
RoleParameters:
type: json
description: Role Specific Parameters
RoleParameters:
type: json
description: Role Specific Parameters
+ default: {}
DeploymentSwiftDataMap:
type: json
description: |
DeploymentSwiftDataMap:
type: json
description: |
@@
-407,6
+408,7
@@
resources:
properties:
server: {get_resource: BlockStorage}
RoleParameters: {get_param: RoleParameters}
properties:
server: {get_resource: BlockStorage}
RoleParameters: {get_param: RoleParameters}
+ ServiceNames: {get_param: ServiceNames}
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment