From 8f79482b4196de6e6700e2f877ca0adc444d1a98 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Wed, 12 May 2021 15:48:08 -0230
Subject: [PATCH] Do not log amphora ssh keys

This patch adds a no_log clause to external_deploy tasks that might
result in an SSH key getting logged.

Change-Id: I2a38a48aabdc167134aee757cd5270af4c498c8d
Related-Bug: #1918138
(cherry picked from commit c65058889e5957c5c1b3c562d9244484abc94e79)
---
 deployment/octavia/octavia-deployment-config.j2.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml
index 68727a2d8a..2f0d1c45e2 100644
--- a/deployment/octavia/octavia-deployment-config.j2.yaml
+++ b/deployment/octavia/octavia-deployment-config.j2.yaml
@@ -276,6 +276,7 @@ outputs:
             - name: Set up group_vars
               set_fact:
                 octavia_ansible_group_vars: { get_attr: [OctaviaVars, value, vars] }
+              no_log: "{{ hide_sensitive_logs | bool }}"
             - name: Make needed directories on the undercloud
               become: true
               file:
@@ -290,6 +291,7 @@ outputs:
               copy:
                 dest: "{{ octavia_ansible_group_vars.octavia_group_vars_dir }}/octavia_vars.yaml"
                 content: "{{ octavia_ansible_group_vars|to_nice_yaml }}"
+              no_log: "{{ hide_sensitive_logs | bool }}"
             - name: Write octavia inventory
               copy:
                 dest: "{{playbook_dir}}/octavia-ansible/inventory.yaml"