Merge "Fix logging_sources map_merge issues"
This commit is contained in:
commit
72c4b8c126
|
@ -204,11 +204,9 @@ outputs:
|
|||
- {}
|
||||
- cinder::wsgi::apache::workers: {get_param: CinderWorkers}
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CinderBase, role_data, service_config_settings]
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_cinder_api:
|
||||
- {get_param: CinderApiLoggingSource}
|
||||
rsyslog:
|
||||
tripleo_logging_sources_cinder_api:
|
||||
- {get_param: CinderApiLoggingSource}
|
||||
mysql:
|
||||
cinder::db::mysql::password: {get_param: CinderPassword}
|
||||
cinder::db::mysql::user: cinder
|
||||
|
|
|
@ -114,11 +114,9 @@ outputs:
|
|||
cinder::backup::nfs::backup_share: {get_param: CinderBackupNfsShare}
|
||||
cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions}
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CinderBase, role_data, service_config_settings]
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_cinder_backup:
|
||||
- {get_param: DockerCinderBackupLoggingSource}
|
||||
rsyslog:
|
||||
tripleo_logging_sources_cinder_backup:
|
||||
- {get_param: DockerCinderBackupLoggingSource}
|
||||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: cinder
|
||||
|
|
|
@ -143,11 +143,7 @@ outputs:
|
|||
cinder::backup::manage_service: false
|
||||
cinder::backup::enabled: false
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CinderBackupBase, role_data, service_config_settings]
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_cinder_backup:
|
||||
- {get_param: DockerCinderBackupLoggingSource}
|
||||
get_attr: [CinderBackupBase, role_data, service_config_settings]
|
||||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: cinder
|
||||
|
|
|
@ -73,11 +73,9 @@ outputs:
|
|||
- get_attr: [CinderBase, role_data, config_settings]
|
||||
- cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CinderBase, role_data, service_config_settings]
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_cinder_scheduler:
|
||||
- {get_param: CinderSchedulerLoggingSource}
|
||||
rsyslog:
|
||||
tripleo_logging_sources_cinder_scheduler:
|
||||
- {get_param: CinderSchedulerLoggingSource}
|
||||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: cinder
|
||||
|
|
|
@ -280,11 +280,9 @@ outputs:
|
|||
$NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
|
||||
- {}
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CinderBase, role_data, service_config_settings]
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_cinder_volume:
|
||||
- {get_param: CinderVolumeLoggingSource}
|
||||
rsyslog:
|
||||
tripleo_logging_sources_cinder_volume:
|
||||
- {get_param: CinderVolumeLoggingSource}
|
||||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: cinder
|
||||
|
|
|
@ -131,11 +131,7 @@ outputs:
|
|||
cinder::volume::enabled: false
|
||||
cinder::backend_host: hostgroup
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CinderBase, role_data, service_config_settings]
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_cinder_volume:
|
||||
- {get_param: CinderVolumeLoggingSource}
|
||||
get_attr: [CinderBase, role_data, service_config_settings]
|
||||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: cinder
|
||||
|
|
|
@ -183,10 +183,9 @@ outputs:
|
|||
- {}
|
||||
- placement::wsgi::apache::workers: {get_param: PlacementWorkers}
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- rsyslog:
|
||||
tripleo_logging_sources_placement:
|
||||
- {get_param: PlacementLoggingSource}
|
||||
rsyslog:
|
||||
tripleo_logging_sources_placement:
|
||||
- {get_param: PlacementLoggingSource}
|
||||
mysql:
|
||||
placement::db::mysql::password: {get_param: PlacementPassword}
|
||||
placement::db::mysql::user: placement
|
||||
|
|
Loading…
Reference in New Issue