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
Next generation HA architecture work
[apex-tripleo-heat-templates.git]
/
puppet
/
cinder-storage.yaml
diff --git
a/puppet/cinder-storage.yaml
b/puppet/cinder-storage.yaml
index
0bac1a4
..
edd81b9
100644
(file)
--- a/
puppet/cinder-storage.yaml
+++ b/
puppet/cinder-storage.yaml
@@
-91,14
+91,17
@@
parameters:
ServiceConfigSettings:
type: json
default: {}
ServiceConfigSettings:
type: json
default: {}
+ ServiceNames:
+ type: comma_delimited_list
+ default: []
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
- default: os-refresh-config
+ default: os-refresh-config
--timeout 14400
resources:
BlockStorage:
resources:
BlockStorage:
- type: OS::
Nova
::Server
+ type: OS::
TripleO
::Server
metadata:
os-collect-config:
command: {get_param: ConfigCommand}
metadata:
os-collect-config:
command: {get_param: ConfigCommand}
@@
-253,6
+256,7
@@
resources:
- heat_config_%{::deploy_config_name}
- volume_extraconfig
- extraconfig
- heat_config_%{::deploy_config_name}
- volume_extraconfig
- extraconfig
+ - service_names
- service_configs
- volume
- all_nodes # provided by allNodesConfig
- service_configs
- volume
- all_nodes # provided by allNodesConfig
@@
-261,6
+265,9
@@
resources:
- network
merge_behavior: deeper
datafiles:
- network
merge_behavior: deeper
datafiles:
+ service_names:
+ mapped_data:
+ service_names: {get_param: ServiceNames}
service_configs:
mapped_data: {get_param: ServiceConfigSettings}
common:
service_configs:
mapped_data: {get_param: ServiceConfigSettings}
common:
@@
-313,6
+320,12
@@
resources:
get_param: UpdateIdentifier
outputs:
get_param: UpdateIdentifier
outputs:
+ ip_address:
+ description: IP address of the server in the ctlplane network
+ value: {get_attr: [BlockStorage, networks, ctlplane, 0]}
+ hostname:
+ description: Hostname of the server
+ value: {get_attr: [BlockStorage, name]}
hosts_entry:
value:
str_replace:
hosts_entry:
value:
str_replace:
@@
-386,11
+399,3
@@
outputs:
management_ip_address:
description: IP address of the server in the management network
value: {get_attr: [ManagementPort, ip_address]}
management_ip_address:
description: IP address of the server in the management network
value: {get_attr: [ManagementPort, ip_address]}
- config_identifier:
- description: identifier which changes if the node configuration may need re-applying
- value:
- list_join:
- - ''
- - - {get_attr: [BlockStorageDeployment, deploy_stdout]}
- - {get_attr: [NodeTLSCAData, deploy_stdout]}
- - {get_param: UpdateIdentifier}