diff --git a/roles/engine_setup/tests/test-4.2.yml b/roles/engine_setup/tests/test-4.2.yml index 20634634..5416eea9 100644 --- a/roles/engine_setup/tests/test-4.2.yml +++ b/roles/engine_setup/tests/test-4.2.yml @@ -1,6 +1,8 @@ --- -- import_playbook: containers-deploy.yml -- import_playbook: engine-deploy.yml +- name: Import containers-deploy.yml + import_playbook: containers-deploy.yml +- name: Import engine-deploy.yml + import_playbook: engine-deploy.yml vars: ovirt_engine_setup_version: "4.2" ovirt_release_rpm: "http://plain.resources.ovirt.org/pub/yum-repo/ovirt-release42.rpm" diff --git a/roles/engine_setup/tests/test-master.yml b/roles/engine_setup/tests/test-master.yml index 886abf0e..ebe715e5 100644 --- a/roles/engine_setup/tests/test-master.yml +++ b/roles/engine_setup/tests/test-master.yml @@ -1,6 +1,8 @@ --- -- import_playbook: containers-deploy.yml -- import_playbook: engine-deploy.yml +- name: Import containers-deploy.yml + import_playbook: containers-deploy.yml +- name: Import engine-deploy.yml + import_playbook: engine-deploy.yml vars: ovirt_engine_setup_version: "4.5" ovirt_release_rpm: "http://plain.resources.ovirt.org/pub/yum-repo/ovirt-release-master.rpm" diff --git a/roles/engine_setup/tests/test-upgrade-4.2-to-master.yml b/roles/engine_setup/tests/test-upgrade-4.2-to-master.yml index 32516116..d655db19 100644 --- a/roles/engine_setup/tests/test-upgrade-4.2-to-master.yml +++ b/roles/engine_setup/tests/test-upgrade-4.2-to-master.yml @@ -1,10 +1,13 @@ --- -- import_playbook: containers-deploy.yml -- import_playbook: engine-deploy.yml +- name: Import containers-deploy.yml + import_playbook: containers-deploy.yml +- name: Import engine-deploy.yml 4.2 + import_playbook: engine-deploy.yml vars: ovirt_engine_setup_version: "4.2" ovirt_release_rpm: "http://plain.resources.ovirt.org/pub/yum-repo/ovirt-release42.rpm" -- import_playbook: engine-upgrade.yml +- name: Import engine-deploy.yml 4.3 + import_playbook: engine-upgrade.yml vars: ovirt_engine_setup_version: "4.3" ovirt_release_rpm: "http://plain.resources.ovirt.org/pub/yum-repo/ovirt-release-master.rpm" diff --git a/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml b/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml index 30cdce28..6c3df763 100644 --- a/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml +++ b/roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml @@ -136,7 +136,7 @@ chdir: "{{ he_local_vm_dir }}" become: true become_user: vdsm - become_method: sudo + become_method: ansible.builtin.sudo changed_when: true tags: ['skip_ansible_lint'] - name: Create ovirt-hosted-engine-ha run directory @@ -190,7 +190,7 @@ environment: "{{ he_cmd_lang }}" become: true become_user: vdsm - become_method: sudo + become_method: ansible.builtin.sudo changed_when: true - name: Initialize metadata volume # Data is written at offset 4KiB*host_id and since ovirt supports 250 hosts per dc, @@ -199,7 +199,7 @@ environment: "{{ he_cmd_lang }}" become: true become_user: vdsm - become_method: sudo + become_method: ansible.builtin.sudo changed_when: true - include_tasks: ../get_local_vm_disk_path.yml - name: Generate DHCP network configuration for the engine VM @@ -279,14 +279,14 @@ environment: "{{ he_cmd_lang }}" become: true become_user: vdsm - become_method: sudo + become_method: ansible.builtin.sudo changed_when: true - name: Verify copy of VM disk ansible.builtin.command: qemu-img compare {{ local_vm_disk_path }} {{ he_virtio_disk_path }} environment: "{{ he_cmd_lang }}" become: true become_user: vdsm - become_method: sudo + become_method: ansible.builtin.sudo changed_when: true when: he_debug_mode|bool - name: Remove rule from fapolicy