From 18a2933a29095f3ff98c141b6fcead40de0bd0f9 Mon Sep 17 00:00:00 2001 From: reliezer Date: Wed, 3 Mar 2021 10:39:07 +0200 Subject: [PATCH] Add an answer for the PKI confirm skip question This answer is supported by the hosted_engine_setup role but it is not supported by engine_setup role --- roles/engine_setup/README.md | 1 + roles/engine_setup/defaults/main.yml | 2 ++ roles/engine_setup/templates/answerfile_4.4_basic.txt.j2 | 1 + 3 files changed, 4 insertions(+) diff --git a/roles/engine_setup/README.md b/roles/engine_setup/README.md index 917a18a1..6eb7c199 100644 --- a/roles/engine_setup/README.md +++ b/roles/engine_setup/README.md @@ -41,6 +41,7 @@ to ``ovirt_engine_setup_answer_file_path`` variable. | ovirt_engine_setup_wait_running_tasks | False | If `True`, engine-setup will wait for running tasks to finish. Valid for `ovirt_engine_setup_version` >= 4.2. | | ovirt_engine_cinderlib_enable | False | If `True`, cinderlib is enabled. Valid for `ovirt_engine_setup_version` >= 4.3. | | ovirt_engine_grafana_enable | True | If `True`, Grafana integration will be set up. Valid for `ovirt_engine_setup_version` >= 4.4. | +| ovirt_engine_setup_skip_renew_pki_confirm | True | If `True` PKI renewal will be skipped | ovirt_engine_setup_engine_configs | [] | List of dictionaries with keys `key`, `value` and `version`. The engine-config will be called with parametrs "-s `key`=`value`" when specified `version` it will append "--cver=`version`" to the config. | * Engine Database: diff --git a/roles/engine_setup/defaults/main.yml b/roles/engine_setup/defaults/main.yml index 6e015ead..e5b9cdff 100644 --- a/roles/engine_setup/defaults/main.yml +++ b/roles/engine_setup/defaults/main.yml @@ -37,3 +37,5 @@ ovirt_engine_apache_config_root_redirection: true ovirt_engine_setup_restore_engine_cleanup: false ovirt_engine_setup_restore_options: {} + +ovirt_engine_setup_skip_renew_pki_confirm: true diff --git a/roles/engine_setup/templates/answerfile_4.4_basic.txt.j2 b/roles/engine_setup/templates/answerfile_4.4_basic.txt.j2 index e7776353..008f9d9d 100644 --- a/roles/engine_setup/templates/answerfile_4.4_basic.txt.j2 +++ b/roles/engine_setup/templates/answerfile_4.4_basic.txt.j2 @@ -1,3 +1,4 @@ {% include "./templates/answerfile_4.3_basic.txt.j2" %} OVESETUP_GRAFANA_CORE/enable=bool:{{ ovirt_engine_grafana_enable }} +OVESETUP_SKIP_RENEW_PKI_CONFIRM/enable=bool:{{ ovirt_engine_setup_skip_renew_pki_confirm }}