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
Making nova parameters configurable for nuage-metadata-agent
[apex-tripleo-heat-templates.git]
/
puppet
/
ceph-storage.yaml
diff --git
a/puppet/ceph-storage.yaml
b/puppet/ceph-storage.yaml
index
0bf0fde
..
1dc20a5
100644
(file)
--- a/
puppet/ceph-storage.yaml
+++ b/
puppet/ceph-storage.yaml
@@
-59,6
+59,13
@@
parameters:
description: >
Heat action when to apply network configuration changes
default: ['CREATE']
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:
resources:
CephStorage:
@@
-176,6
+183,13
@@
resources:
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
ceph::profile::params::public_network: {get_input: ceph_public_network}
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
ceph::profile::params::public_network: {get_input: ceph_public_network}
+ # Resource for site-specific injection of root certificate
+ NodeTLSCAData:
+ depends_on: CephStorageDeployment
+ type: OS::TripleO::NodeTLSCAData
+ properties:
+ server: {get_resource: CephStorage}
+
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
CephStorageExtraConfigPre:
depends_on: CephStorageDeployment
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
CephStorageExtraConfigPre:
depends_on: CephStorageDeployment
@@
-186,7
+200,7
@@
resources:
# Hook for site-specific additional pre-deployment config,
# applying to all nodes, e.g node registration/unregistration
NodeExtraConfig:
# Hook for site-specific additional pre-deployment config,
# applying to all nodes, e.g node registration/unregistration
NodeExtraConfig:
- depends_on:
CephStorageExtraConfigPre
+ depends_on:
[CephStorageExtraConfigPre, NodeTLSCAData]
type: OS::TripleO::NodeExtraConfig
properties:
server: {get_resource: CephStorage}
type: OS::TripleO::NodeExtraConfig
properties:
server: {get_resource: CephStorage}
@@
-207,9
+221,10
@@
outputs:
hosts_entry:
value:
str_replace:
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]}]}
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
HOST: {get_attr: [CephStorage, name]}
nova_server_resource:
description: Heat resource handle for the ceph storage server
@@
-227,5
+242,6
@@
outputs:
list_join:
- ','
- - {get_attr: [CephStorageDeployment, deploy_stdout]}
list_join:
- ','
- - {get_attr: [CephStorageDeployment, deploy_stdout]}
+ - {get_attr: [NodeTLSCAData, deploy_stdout]}
- {get_attr: [CephStorageExtraConfigPre, deploy_stdout]}
- {get_param: UpdateIdentifier}
- {get_attr: [CephStorageExtraConfigPre, deploy_stdout]}
- {get_param: UpdateIdentifier}