Fix upgrade flow

Change-Id: I9b32e6568dcdda2ac1d5851ef17eb805ff25cc0d
Signed-off-by: Ondra Machacek <[email protected]>

Author: machacekondra

README.md

@@ -55,7 +55,6 @@ as ``ovirt_engine_setup_answer_file_path``.
 | ovirt_engine_setup_update_setup_packages | False              | If `True`, setup packages will be updated before `engine-setup` will be executed. Makes sense if Engine is already installed. |
 | ovirt_engine_setup_update_all_packages | True                 | If `True`, all packages will be updated before `engine-setup` will be executed. |
 | ovirt_engine_setup_offline            | False                 | If `True`, `engine-setup` will not search for package updates. |
-| ovirt_engine_setup_accept_defaults    | False                 | If `True` default answers will be automatically used in questions that have them during `engine-setup`. |
 | ovirt_engine_setup_require_rollback   | UNDEF                 | If `True` setup will require to be able to rollback new packages in case of a failure. If not passed the default answer from `engine-setup` will be chosen. Valid for updating/upgrading. |
 | ovirt_engine_setup_admin_password     | UNDEF                 | Password for the automatically created administrative user of the oVirt Engine.
 | ovirt_engine_setup_perform_upgrade    | False                 | If true this role is used to perform upgrade. |

tasks/engine_setup.yml

@@ -32,6 +32,8 @@
     # fixed by suggested update_only parameter.
     command: yum -y update ovirt\*setup\*
     when: ovirt_engine_setup_update_setup_packages or ovirt_engine_setup_perform_upgrade
+    args:
+      warn: false
     tags:
       - "skip_ansible_lint"  # ANSIBLE0006
 
@@ -43,16 +45,12 @@
     tags:
       - "skip_ansible_lint"  # ANSIBLE0010
 
-  - name: Set accept defaults parameter if variable is set
-    set_fact:
-      accept_defaults: "{{ '--accept-defaults' if ovirt_engine_setup_accept_defaults or ovirt_engine_setup_perform_upgrade else '' }}"
-
   - name: Set offline parameter if variable is set
     set_fact:
       offline: "{{ '--offline' if ovirt_engine_setup_offline else '' }}"
 
   - name: Run engine-setup with answerfile
-    command: "engine-setup --config-append={{ answer_file_path }} {{ accept_defaults }} {{ offline }}"
+    command: "engine-setup --accept-defaults --config-append={{ answer_file_path }} {{ offline }}"
     tags:
       - skip_ansible_lint
 
@@ -68,7 +66,7 @@
     register: health_page
     retries: 12
     delay: 10
-    until: health_page|success
+    until: health_page is success
 
   always:
     - name: Clean temporary files

templates/answerfile_4.1_basic.txt.j2

@@ -1,3 +1,3 @@
-{% include "./templates/basic_answerfile.txt.j2" %},
+{% include "./templates/basic_answerfile.txt.j2" %}
 OVESETUP_DB/engineVacuumFull=bool:{{ ovirt_engine_setup_engine_vacuum_full }}
 OVESETUP_DB/dwhVacuumFull=bool:{{ ovirt_engine_setup_dwh_vacuum_full }}

templates/answerfile_4.1_upgrade.txt.j2

@@ -1 +1 @@
-{% include "./templates/basic_answerfile.txt.j2" %},
+{% include "./templates/basic_answerfile.txt.j2" %}

templates/answerfile_4.2_basic.txt.j2

@@ -1,4 +1,4 @@
-{% include "./templates/basic_answerfile.txt.j2" %},
+{% include "./templates/basic_answerfile.txt.j2" %}
 OVESETUP_DB/engineVacuumFull=bool:{{ ovirt_engine_setup_engine_vacuum_full }}
 OVESETUP_DB/dwhVacuumFull=bool:{{ ovirt_engine_setup_dwh_vacuum_full }}
 {% if ovirt_engine_setup_provider_ovn_configure is defined and ovirt_engine_setup_provider_ovn_configure %}

templates/answerfile_4.2_upgrade.txt.j2

@@ -1,4 +1,4 @@
-{% include "./templates/basic_answerfile.txt.j2" %},
+{% include "./templates/basic_answerfile.txt.j2" %}
 {% if ovirt_engine_setup_provider_ovn_configure is defined and ovirt_engine_setup_provider_ovn_configure %}
 OVESETUP_DB/engineVacuumFull=bool:True
 OVESETUP_OVN/ovirtProviderOvn=bool:True

templates/basic_answerfile.txt.j2

@@ -13,6 +13,7 @@ OSETUP_RPMDISTRO/requireRollback=none:None
 {% endif %}
 OVESETUP_DB/host=str:{{ovirt_engine_setup_db_host}}
 OVESETUP_DB/user=str:{{ovirt_engine_setup_db_user}}
+OVESETUP_SYSTEM/memCheckEnabled=bool:False
 {% if ovirt_engine_setup_db_password is defined %}
 OVESETUP_DB/password=str:{{ovirt_engine_setup_db_password}}
 {% else %}
@@ -44,7 +45,9 @@ OVESETUP_DWH_DB/securedHostValidation=bool:False
 {% else %}
 OVESETUP_DWH_DB/securedHostValidation=none:None
 {% endif %}
+{% if ovirt_engine_setup_organization is defined %}
 OVESETUP_PKI/organization=str:{{ ovirt_engine_setup_organization }}
+{% endif %}
 OVESETUP_CONFIG/adminPassword=str:{{ ovirt_engine_setup_admin_password }}
 {% if ovirt_engine_setup_dwh_db_configure is defined and ovirt_engine_setup_dwh_db_configure %}
 OVESETUP_DWH_CORE/enable=bool:True

tests/engine-upgrade.yml

@@ -14,7 +14,4 @@
   roles:
     - role: oVirt.repositories
     - role: oVirt.engine-setup
-      # --accept-defaults needed because of: https://bugzilla.redhat.com/show_bug.cgi?id=1518697
-      # Can be solved also with https://bugzilla.redhat.com/show_bug.cgi?id=1396925
-      ovirt_engine_setup_accept_defaults: true
       ovirt_engine_setup_answer_file_path: "answerfile_{{ ovirt_engine_setup_version }}_upgrade.txt.j2"