From f7a0aff19b0ea87f85a1c8f7313d98162ef07ee6 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Fri, 22 Nov 2019 14:53:53 +0100 Subject: [PATCH] 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 bc4219d274a57a8152e2a6b131e38899425b579c) Change-Id: I3f81128cf2fc748a2d4c8df023686424a6de50b8 --- .../backup-and-restore/rear-baremetal-ansible.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/deployment/backup-and-restore/rear-baremetal-ansible.yaml b/deployment/backup-and-restore/rear-baremetal-ansible.yaml index 51ad388f48..e6023f085a 100644 --- a/deployment/backup-and-restore/rear-baremetal-ansible.yaml +++ b/deployment/backup-and-restore/rear-baremetal-ansible.yaml @@ -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}