From ea5b4d7e26c0cb76a0dee3c16b957eb3898d4c43 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@osism.tech>
Date: Sun, 24 Apr 2022 17:42:38 +0200
Subject: [PATCH] [bifrost] add bifrost_deploy_verbosity parameter

With the parameter bifrost_deploy_verbosity it is possible
to set the verbosity of the bootstrap of Bifrost.

This makes it possible to reduce verbosity when running
/bifrost/playbooks/install.yaml if needed.

Change-Id: I5815220f2193a492ae7e1f63443075790ae7aaef
---
 ansible/roles/bifrost/defaults/main.yml                    | 2 ++
 ansible/roles/bifrost/tasks/bootstrap.yml                  | 3 ++-
 ansible/roles/bifrost/tasks/deploy-servers.yml             | 6 ++++--
 .../notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml   | 7 +++++++
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml

diff --git a/ansible/roles/bifrost/defaults/main.yml b/ansible/roles/bifrost/defaults/main.yml
index 5a1499152..bcff4e8c5 100644
--- a/ansible/roles/bifrost/defaults/main.yml
+++ b/ansible/roles/bifrost/defaults/main.yml
@@ -9,3 +9,5 @@ bifrost_deploy_tag: "{{ bifrost_tag }}"
 bifrost_deploy_image_full: "{{ bifrost_deploy_image }}:{{ bifrost_deploy_tag }}"
 
 bifrost_deploy_container_proxy: "{{ container_proxy }}"
+
+bifrost_deploy_verbosity: "-vvvv"
diff --git a/ansible/roles/bifrost/tasks/bootstrap.yml b/ansible/roles/bifrost/tasks/bootstrap.yml
index 56cd3527e..535c1b4e0 100644
--- a/ansible/roles/bifrost/tasks/bootstrap.yml
+++ b/ansible/roles/bifrost/tasks/bootstrap.yml
@@ -18,7 +18,8 @@
   command: >
      docker exec bifrost_deploy
      bash -c
-     'ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target
+     'ansible-playbook {{ bifrost_deploy_verbosity }}
+     -i /bifrost/playbooks/inventory/target
      /bifrost/playbooks/install.yaml -e @/etc/bifrost/bifrost.yml
      -e @/etc/bifrost/dib.yml -e  skip_package_install=true'
 
diff --git a/ansible/roles/bifrost/tasks/deploy-servers.yml b/ansible/roles/bifrost/tasks/deploy-servers.yml
index ceb69a086..17a2c24f7 100644
--- a/ansible/roles/bifrost/tasks/deploy-servers.yml
+++ b/ansible/roles/bifrost/tasks/deploy-servers.yml
@@ -5,7 +5,8 @@
      docker exec bifrost_deploy
      bash -c 'export OS_CLOUD=bifrost &&
      export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
-     ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
+     ansible-playbook {{ bifrost_deploy_verbosity }}}
+     -i /bifrost/playbooks/inventory/bifrost_inventory.py
      /bifrost/playbooks/enroll-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
 
 - name: Deploy physical servers with ironic
@@ -14,5 +15,6 @@
      docker exec bifrost_deploy
      bash -c 'export OS_CLOUD=bifrost &&
      export BIFROST_INVENTORY_SOURCE=/etc/bifrost/servers.yml &&
-     ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py
+     ansible-playbook {{ bifrost_deploy_verbosity }}
+     -i /bifrost/playbooks/inventory/bifrost_inventory.py
      /bifrost/playbooks/deploy-dynamic.yaml -e @/etc/bifrost/bifrost.yml'
diff --git a/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml b/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml
new file mode 100644
index 000000000..009307927
--- /dev/null
+++ b/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    With the parameter ``bifrost_deploy_verbosity`` it is possible
+    to set the verbosity of the bootstrap of Bifrost.
+
+    By default ``-vvvv`` is set.
-- 
GitLab