From ad2c7b5892695fd8bb99633724bdb31f36d04c70 Mon Sep 17 00:00:00 2001
From: Juan Badia Payno <jbadiapa@redhat.com>
Date: Mon, 15 Jun 2020 09:41:28 +0200
Subject: [PATCH] BaR Ceph authenticacion more ansible way

Instead of execute a command and redirect the output to a file.
This patch gets the output of the command line and writes it
to a file.

Also fixed the molecule-backup_and_restore test

Change-Id: Ie38d8b9fce36ce2f73a2811072e53f405f1367f6
---
 .../backup_and_restore/molecule/default/prepare.yml   |  5 +++--
 .../backup_and_restore/tasks/ceph_authentication.yml  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
index 850524b4f..af50ba650 100644
--- a/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
+++ b/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
@@ -38,13 +38,14 @@
 
   roles:
     - role: test_deps
+      test_deps_setup_tripleo: true
+      test_deps_tripleo_packages:
+        - hiera
       test_deps_extra_packages:
         - rear
         - syslinux
         - genisoimage
         - kbd
-        - puppet
-        - hiera
 
   post_tasks:
     - name: Create hiera config file
diff --git a/tripleo_ansible/roles/backup_and_restore/tasks/ceph_authentication.yml b/tripleo_ansible/roles/backup_and_restore/tasks/ceph_authentication.yml
index e27540505..d8d49edfc 100644
--- a/tripleo_ansible/roles/backup_and_restore/tasks/ceph_authentication.yml
+++ b/tripleo_ansible/roles/backup_and_restore/tasks/ceph_authentication.yml
@@ -35,7 +35,16 @@
 - name: Export ceph authentication
   shell: |
     set -o pipefail
-    {{ tripleo_container_cli }} exec ceph-mon-{{ ansible_hostname }} bash -c "ceph auth export" > {{ tripleo_backup_and_restore_ceph_auth_file }}
+    {{ tripleo_container_cli }} exec ceph-mon-{{ ansible_hostname }} bash -c "ceph auth export"
   become: true
+  register: bar_ceph_autentication_content
+  tags:
+    - bar_create_recover_image
+
+- name: Save ceph authentication at {{ tripleo_backup_and_restore_ceph_auth_file }}
+  copy:
+    dest: "{{ tripleo_backup_and_restore_ceph_auth_file }}"
+    content: |
+        {{ bar_ceph_autentication_content.stdout }}
   tags:
     - bar_create_recover_image