openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use list join for rendering rear config file in heat 

Currently we are rendering the ReaR config file as:
BACKUP_PROG_EXCLUDE=( '/data/*' '/tmp/*' '{u'"'"'get_param'"'"': u'"'"'BackupAndRestoreStorageFolder'"'"'}' )

We need to use heat list_join instead to merge the parameters.
Closes-Bug: #1853819
(cherry picked from commit bc4219d274)
Change-Id: I3f81128cf2fc748a2d4c8df023686424a6de50b8
This commit is contained in:
Carlos Camacho 2019-11-22 14:53:53 +01:00
parent b455d50b1c
commit f7a0aff19b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment/backup-and-restore/rear-baremetal-ansible.yaml
View File

@ -43,7 +43,7 @@ parameters:
tags:
- role_specific
BackupAndRestoreExcludePathsCommon:
default: ['/data/*', '/tmp/*', {get_param: BackupAndRestoreStorageFolder}]
default: ['/data/*', '/tmp/*']
description: Exclude paths commons list
type: comma_delimited_list
tags:
@ -91,7 +91,14 @@ outputs:
ansible_group_vars:
tripleo_backup_and_restore_nfs_server: {get_param: BackupAndRestoreNFSServer}
tripleo_backup_and_restore_storage_folder: {get_param: BackupAndRestoreNFSStorageFolder}
tripleo_backup_and_restore_exclude_paths_common: {get_param: BackupAndRestoreExcludePathsCommon}
tripleo_backup_and_restore_exclude_paths_common:
list_concat_unique:
- {get_param: BackupAndRestoreExcludePathsCommon}
-
- str_replace:
template: 'folder/*'
params:
folder: {get_param: BackupAndRestoreNFSStorageFolder}
tripleo_backup_and_restore_rear_simulate: {get_param: BackupAndRestoreRearSimulate}
tripleo_backup_and_restore_debug: {get_param: BackupAndRestoreDebug}
tripleo_backup_and_restore_local_config: {get_param: BackupAndRestoreLocalConfig}