openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add global_config_settings to services' output"

Browse Source
This commit is contained in:
Jenkins 2016-09-09 09:20:21 +00:00 committed by Gerrit Code Review
commit 56486057c7
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
overcloud.yaml
View File

@ -453,7 +453,15 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
NodeIndex: '%index%'
ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
ServiceConfigSettings:
map_merge:
- get_attr: [ControllerServiceChain, role_data, config_settings]
- get_attr: [ControllerServiceChain, role_data, global_config_settings]
- get_attr: [ComputeServiceChain, role_data, global_config_settings]
- get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
- get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
- get_attr: [CephStorageServiceChain, role_data, global_config_settings]
- get_attr: [ControllerServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [ControllerServiceChain, role_data, monitoring_subscriptions]}
@ -485,7 +493,14 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
NodeIndex: '%index%'
ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
ServiceConfigSettings:
map_merge:
- get_attr: [ComputeServiceChain, role_data, config_settings]
- get_attr: [ControllerServiceChain, role_data, global_config_settings]
- get_attr: [ComputeServiceChain, role_data, global_config_settings]
- get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
- get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
- get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [ComputeServiceChain, role_data, monitoring_subscriptions]}
@ -518,7 +533,14 @@ resources:
CloudDomain: {get_param: CloudDomain}
ServerMetadata: {get_param: ServerMetadata}
NodeIndex: '%index%'
ServiceConfigSettings: {get_attr: [BlockStorageServiceChain, role_data, config_settings]}
ServiceConfigSettings:
map_merge:
- get_attr: [BlockStorageServiceChain, role_data, config_settings]
- get_attr: [ControllerServiceChain, role_data, global_config_settings]
- get_attr: [ComputeServiceChain, role_data, global_config_settings]
- get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
- get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
- get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [BlockStorageServiceChain, role_data, monitoring_subscriptions]}
@ -551,7 +573,14 @@ resources:
CloudDomain: {get_param: CloudDomain}
ServerMetadata: {get_param: ServerMetadata}
NodeIndex: '%index%'
ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, role_data, config_settings]}
ServiceConfigSettings:
map_merge:
- get_attr: [ObjectStorageServiceChain, role_data, config_settings]
- get_attr: [ControllerServiceChain, role_data, global_config_settings]
- get_attr: [ComputeServiceChain, role_data, global_config_settings]
- get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
- get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
- get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [ObjectStorageServiceChain, role_data, monitoring_subscriptions]}
@ -584,7 +613,14 @@ resources:
CloudDomain: {get_param: CloudDomain}
ServerMetadata: {get_param: ServerMetadata}
NodeIndex: '%index%'
ServiceConfigSettings: {get_attr: [CephStorageServiceChain, role_data, config_settings]}
ServiceConfigSettings:
map_merge:
- get_attr: [CephStorageServiceChain, role_data, config_settings]
- get_attr: [ControllerServiceChain, role_data, global_config_settings]
- get_attr: [ComputeServiceChain, role_data, global_config_settings]
- get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
- get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
- get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [CephStorageServiceChain, role_data, monitoring_subscriptions]}

2
puppet/services/README.rst
View File

@ -31,6 +31,8 @@ are re-asserted when applying latter ones.
* config_settings: Custom hiera settings for this service.
* global_config_settings: Additional hiera settings distributed to all roles.
* step_config: A puppet manifest that is used to step through the deployment
sequence. Each sequence is given a "step" (via hiera('step') that provides
information for when puppet classes should activate themselves.

5
puppet/services/services.yaml
View File

@ -54,4 +54,9 @@ outputs:
expression: list($.data.subscriptions.where($ != null))
data: {subscriptions: {get_attr: [ServiceChain, role_data, monitoring_subscription]}}
config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
global_config_settings:
map_merge:
yaql:
expression: list($.data.configs.where($ != null))
data: {configs: {get_attr: [ServiceChain, role_data, global_config_settings]}}
step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}