From 06416073a98cc0e9fd1b1b453828c499f3e149f4 Mon Sep 17 00:00:00 2001 From: Juan Badia Payno Date: Tue, 13 Oct 2020 15:28:35 +0200 Subject: [PATCH] BaR doc update + lftp missing package There is a ReaR option to copy files to the backup with sftp this "feature" needs the lftp package. This patch adds the lftp package to be installed when ReaR is installed. The documentation regarding backup-and-restore was updated, the name of the role uses underscores and dash. This patch updates the name of the role on the documentation and modified the underscores with dashes. Change-Id: I5435780a280e9a1eecacab488de1f0e5165f430e (cherry picked from commit 31eec764dae66f556007eb4f4cbfbe943c0d9f0c) (cherry picked from commit 11445ff9e59c062472a8f44376d3e1006fabcad6) --- doc/source/roles/role-backup-and-restore.rst | 2 +- molecule-requirements.txt | 1 - tripleo_ansible/roles/backup-and-restore/vars/redhat.yml | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/roles/role-backup-and-restore.rst b/doc/source/roles/role-backup-and-restore.rst index 02161b1c6..4e7b40746 100644 --- a/doc/source/roles/role-backup-and-restore.rst +++ b/doc/source/roles/role-backup-and-restore.rst @@ -83,7 +83,7 @@ Now we create the playbook to create the actual backup. tasks: - name: Backup ceph authentication role include_role: - name: backup_and_restore + name: backup-and-restore tasks_from: ceph_authentication tags: - bar_create_recover_image diff --git a/molecule-requirements.txt b/molecule-requirements.txt index 4c466eb5b..429199cda 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -1,5 +1,4 @@ # this is required for the molecule jobs -ansible ansi2html docker pytest diff --git a/tripleo_ansible/roles/backup-and-restore/vars/redhat.yml b/tripleo_ansible/roles/backup-and-restore/vars/redhat.yml index 16d2be52d..d502f45cf 100644 --- a/tripleo_ansible/roles/backup-and-restore/vars/redhat.yml +++ b/tripleo_ansible/roles/backup-and-restore/vars/redhat.yml @@ -26,5 +26,6 @@ tripleo_backup_and_restore_rear_packages: - syslinux - genisoimage - nfs-utils + - lftp tripleo_backup_and_restore_nfs_packages: - nfs-utils