From 1f433f4eafb9a61850930d92a7da2297c271854f Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Tue, 12 Sep 2023 14:25:19 +0200 Subject: [PATCH] Restoring molecule tests This is essentially a preventative action to ensure our compatibility in case of another Molecule version bump and associated API change. - setting role references to FQN in molecule tests Signed-off-by: Jiri Podivin --- roles/edpm_bootstrap/molecule/default/prepare.yml | 2 +- roles/edpm_ceph_client_files/molecule/default/prepare.yml | 2 +- roles/edpm_ceph_hci_pre/molecule/default/prepare.yml | 2 +- roles/edpm_chrony/molecule/default/prepare.yml | 2 +- roles/edpm_container_manage/molecule/default/prepare.yml | 2 +- roles/edpm_container_rm/molecule/default/converge.yml | 2 +- roles/edpm_container_rm/molecule/default/prepare.yml | 2 +- .../molecule/podman-rm-stopped/converge.yml | 2 +- .../molecule/podman-rm-stopped/prepare.yml | 2 +- .../molecule/default/prepare.yml | 2 +- roles/edpm_ddp_package/molecule/default/prepare.yml | 2 +- roles/edpm_download_cache/molecule/default/prepare.yml | 2 +- roles/edpm_growvols/molecule/default/prepare.yml | 2 +- roles/edpm_iscsid/molecule/default/prepare.yml | 2 +- roles/edpm_kernel/molecule/default/converge.yml | 2 +- .../converge.yml | 4 ++-- .../converge.yml | 4 ++-- .../molecule/kernelargs-hugepages-nochange/converge.yml | 4 ++-- roles/edpm_kernel/molecule/kernelargs-update/converge.yml | 2 +- roles/edpm_kernel/resources/molecule/converge.yml | 2 +- roles/edpm_kernel/resources/molecule/prepare.yml | 2 +- roles/edpm_kernel/tasks/kernelargs.yml | 2 +- roles/edpm_libvirt/molecule/default/converge.yml | 2 +- roles/edpm_libvirt/molecule/default/prepare.yml | 6 +++--- roles/edpm_module_load/molecule/default/converge.yml | 2 +- roles/edpm_module_load/molecule/default/prepare.yml | 2 +- roles/edpm_module_load/molecule/legacy_vars/converge.yml | 2 +- roles/edpm_module_load/molecule/legacy_vars/prepare.yml | 2 +- .../edpm_module_load/molecule/remove_module/converge.yml | 4 ++-- roles/edpm_module_load/molecule/remove_module/prepare.yml | 2 +- roles/edpm_network_config/molecule/default/prepare.yml | 2 +- roles/edpm_network_config/molecule/nmstate/prepare.yml | 2 +- roles/edpm_nftables/molecule/action/prepare.yml | 4 ++-- roles/edpm_nftables/molecule/default/prepare.yml | 2 +- roles/edpm_nftables/molecule/destination/prepare.yml | 2 +- roles/edpm_nftables/molecule/source/prepare.yml | 2 +- roles/edpm_nftables/molecule/update_rules/prepare.yml | 2 +- roles/edpm_nodes_validation/molecule/default/prepare.yml | 2 +- roles/edpm_nova/molecule/default/converge.yml | 2 +- roles/edpm_nova/molecule/default/prepare.yml | 8 ++++---- roles/edpm_nova_compute/molecule/default/prepare.yml | 2 +- roles/edpm_nova_libvirt/resources/molecule/converge.yml | 2 +- roles/edpm_nova_libvirt/resources/molecule/prepare.yml | 2 +- roles/edpm_ovn/molecule/default/prepare.yml | 2 +- roles/edpm_ovn/molecule/noconfig/prepare.yml | 2 +- roles/edpm_podman/molecule/default/converge.yml | 2 +- roles/edpm_podman/molecule/default/prepare.yml | 2 +- roles/edpm_podman/molecule/install/converge.yml | 2 +- roles/edpm_podman/molecule/install/prepare.yml | 2 +- roles/edpm_podman/molecule/login/converge.yml | 4 ++-- roles/edpm_podman/molecule/login/prepare.yml | 4 ++-- roles/edpm_ssh_known_hosts/molecule/default/prepare.yml | 2 +- .../edpm_ssh_known_hosts/molecule/no_networks/prepare.yml | 2 +- roles/edpm_telemetry/molecule/default/prepare.yml | 2 +- roles/edpm_timezone/molecule/default/prepare.yml | 2 +- roles/edpm_tuned/molecule/default/prepare.yml | 2 +- roles/edpm_tuned/molecule/isolated/prepare.yml | 2 +- roles/env_data/meta/argument_specs.yml | 2 +- roles/env_data/meta/main.yml | 2 +- roles/env_data/molecule/default/converge.yml | 2 +- 60 files changed, 72 insertions(+), 72 deletions(-) diff --git a/roles/edpm_bootstrap/molecule/default/prepare.yml b/roles/edpm_bootstrap/molecule/default/prepare.yml index 5ff82820c..284398d06 100644 --- a/roles/edpm_bootstrap/molecule/default/prepare.yml +++ b/roles/edpm_bootstrap/molecule/default/prepare.yml @@ -26,7 +26,7 @@ - name: Prepare container hosts: instance roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Mock ovs-vswitchd service community.general.ini_file: diff --git a/roles/edpm_ceph_client_files/molecule/default/prepare.yml b/roles/edpm_ceph_client_files/molecule/default/prepare.yml index 6d13b1503..9345a6f35 100644 --- a/roles/edpm_ceph_client_files/molecule/default/prepare.yml +++ b/roles/edpm_ceph_client_files/molecule/default/prepare.yml @@ -20,4 +20,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_ceph_hci_pre/molecule/default/prepare.yml b/roles/edpm_ceph_hci_pre/molecule/default/prepare.yml index a00400506..1977f3ecb 100644 --- a/roles/edpm_ceph_hci_pre/molecule/default/prepare.yml +++ b/roles/edpm_ceph_hci_pre/molecule/default/prepare.yml @@ -18,4 +18,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_chrony/molecule/default/prepare.yml b/roles/edpm_chrony/molecule/default/prepare.yml index f31592c89..04a613238 100644 --- a/roles/edpm_chrony/molecule/default/prepare.yml +++ b/roles/edpm_chrony/molecule/default/prepare.yml @@ -22,4 +22,4 @@ - name: Prepare container hosts: instance roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_container_manage/molecule/default/prepare.yml b/roles/edpm_container_manage/molecule/default/prepare.yml index 552015eaa..efdd97a50 100644 --- a/roles/edpm_container_manage/molecule/default/prepare.yml +++ b/roles/edpm_container_manage/molecule/default/prepare.yml @@ -23,7 +23,7 @@ hosts: all become: true roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Prepare the container configs directory file: diff --git a/roles/edpm_container_rm/molecule/default/converge.yml b/roles/edpm_container_rm/molecule/default/converge.yml index 94dff16a7..9d7d0bb25 100644 --- a/roles/edpm_container_rm/molecule/default/converge.yml +++ b/roles/edpm_container_rm/molecule/default/converge.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: edpm_container_rm + - role: osp.edpm.edpm_container_rm edpm_container_cli: podman edpm_containers_to_rm: - podman-container1 diff --git a/roles/edpm_container_rm/molecule/default/prepare.yml b/roles/edpm_container_rm/molecule/default/prepare.yml index 9d6076d05..255f991b6 100644 --- a/roles/edpm_container_rm/molecule/default/prepare.yml +++ b/roles/edpm_container_rm/molecule/default/prepare.yml @@ -24,7 +24,7 @@ become: true gather_facts: true roles: - - role: env_data + - role: osp.edpm.env_data post_tasks: - name: Pull container image containers.podman.podman_image: diff --git a/roles/edpm_container_rm/molecule/podman-rm-stopped/converge.yml b/roles/edpm_container_rm/molecule/podman-rm-stopped/converge.yml index 94dff16a7..9d7d0bb25 100644 --- a/roles/edpm_container_rm/molecule/podman-rm-stopped/converge.yml +++ b/roles/edpm_container_rm/molecule/podman-rm-stopped/converge.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: edpm_container_rm + - role: osp.edpm.edpm_container_rm edpm_container_cli: podman edpm_containers_to_rm: - podman-container1 diff --git a/roles/edpm_container_rm/molecule/podman-rm-stopped/prepare.yml b/roles/edpm_container_rm/molecule/podman-rm-stopped/prepare.yml index ed2852d35..084e90875 100644 --- a/roles/edpm_container_rm/molecule/podman-rm-stopped/prepare.yml +++ b/roles/edpm_container_rm/molecule/podman-rm-stopped/prepare.yml @@ -25,7 +25,7 @@ become: true gather_facts: true roles: - - role: env_data + - role: osp.edpm.env_data post_tasks: - name: Pull container image containers.podman.podman_image: diff --git a/roles/edpm_container_standalone/molecule/default/prepare.yml b/roles/edpm_container_standalone/molecule/default/prepare.yml index 4dea52792..397a9ba48 100644 --- a/roles/edpm_container_standalone/molecule/default/prepare.yml +++ b/roles/edpm_container_standalone/molecule/default/prepare.yml @@ -23,4 +23,4 @@ hosts: all become: true roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_ddp_package/molecule/default/prepare.yml b/roles/edpm_ddp_package/molecule/default/prepare.yml index f1f6a3989..90a22606b 100644 --- a/roles/edpm_ddp_package/molecule/default/prepare.yml +++ b/roles/edpm_ddp_package/molecule/default/prepare.yml @@ -20,4 +20,4 @@ - role: ../../../../molecule/common/test_deps test_deps_setup_edpm: true test_deps_setup_stream: true - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_download_cache/molecule/default/prepare.yml b/roles/edpm_download_cache/molecule/default/prepare.yml index e219a9670..e58ee34ab 100644 --- a/roles/edpm_download_cache/molecule/default/prepare.yml +++ b/roles/edpm_download_cache/molecule/default/prepare.yml @@ -27,4 +27,4 @@ - name: Prepare container hosts: instance roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_growvols/molecule/default/prepare.yml b/roles/edpm_growvols/molecule/default/prepare.yml index 6d13b1503..9345a6f35 100644 --- a/roles/edpm_growvols/molecule/default/prepare.yml +++ b/roles/edpm_growvols/molecule/default/prepare.yml @@ -20,4 +20,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_iscsid/molecule/default/prepare.yml b/roles/edpm_iscsid/molecule/default/prepare.yml index 728656f24..5386ac5e8 100644 --- a/roles/edpm_iscsid/molecule/default/prepare.yml +++ b/roles/edpm_iscsid/molecule/default/prepare.yml @@ -24,4 +24,4 @@ hosts: all become: true roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_kernel/molecule/default/converge.yml b/roles/edpm_kernel/molecule/default/converge.yml index fa12c7cb7..29b493a31 100644 --- a/roles/edpm_kernel/molecule/default/converge.yml +++ b/roles/edpm_kernel/molecule/default/converge.yml @@ -21,4 +21,4 @@ - name: Backing up /etc/default/grub import_tasks: ../../resources/molecule/backup_grub.yml roles: - - role: "edpm_kernel" + - role: osp.edpm.edpm_kernel diff --git a/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-change/converge.yml b/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-change/converge.yml index 785e569e6..c8257cc57 100644 --- a/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-change/converge.yml +++ b/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-change/converge.yml @@ -24,7 +24,7 @@ import_tasks: ../../resources/molecule/backup_grub.yml tasks: - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true @@ -32,7 +32,7 @@ stdout: "{{ _mocked_cmdline_original }}" stdout_lines: ["{{ _mocked_cmdline_original }}"] - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_hugepages: diff --git a/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-nochange/converge.yml b/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-nochange/converge.yml index 3ced59708..a1442b01f 100644 --- a/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-nochange/converge.yml +++ b/roles/edpm_kernel/molecule/kernelargs-hugepages-modify-idempotency-nochange/converge.yml @@ -24,7 +24,7 @@ import_tasks: ../../resources/molecule/backup_grub.yml tasks: - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true @@ -32,7 +32,7 @@ stdout: "{{ _mocked_cmdline_original }}" stdout_lines: ["{{ _mocked_cmdline_original }}"] - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true diff --git a/roles/edpm_kernel/molecule/kernelargs-hugepages-nochange/converge.yml b/roles/edpm_kernel/molecule/kernelargs-hugepages-nochange/converge.yml index 1343a3765..21dcd5079 100644 --- a/roles/edpm_kernel/molecule/kernelargs-hugepages-nochange/converge.yml +++ b/roles/edpm_kernel/molecule/kernelargs-hugepages-nochange/converge.yml @@ -24,7 +24,7 @@ import_tasks: ../../resources/molecule/backup_grub.yml tasks: - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true @@ -32,7 +32,7 @@ stdout: "{{ _mocked_cmdline }}" stdout_lines: ["{{ _mocked_cmdline }}"] - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true diff --git a/roles/edpm_kernel/molecule/kernelargs-update/converge.yml b/roles/edpm_kernel/molecule/kernelargs-update/converge.yml index 1a430e016..92c759233 100644 --- a/roles/edpm_kernel/molecule/kernelargs-update/converge.yml +++ b/roles/edpm_kernel/molecule/kernelargs-update/converge.yml @@ -35,7 +35,7 @@ line: 'GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX:+$GRUB_CMDLINE_LINUX }${EDPM_KERNEL_ARGS}"' insertafter: '^EDPM_KERNEL_ARGS.*' - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true diff --git a/roles/edpm_kernel/resources/molecule/converge.yml b/roles/edpm_kernel/resources/molecule/converge.yml index b6f7c78e1..7b42b0082 100644 --- a/roles/edpm_kernel/resources/molecule/converge.yml +++ b/roles/edpm_kernel/resources/molecule/converge.yml @@ -24,7 +24,7 @@ import_tasks: ../../resources/molecule/backup_grub.yml tasks: - include_role: - name: "edpm_kernel" + name: osp.edpm.edpm_kernel tasks_from: kernelargs.yml vars: edpm_kernel_defer_reboot: true diff --git a/roles/edpm_kernel/resources/molecule/prepare.yml b/roles/edpm_kernel/resources/molecule/prepare.yml index 0560aa65c..61af57226 100644 --- a/roles/edpm_kernel/resources/molecule/prepare.yml +++ b/roles/edpm_kernel/resources/molecule/prepare.yml @@ -19,4 +19,4 @@ hosts: all roles: - role: ../../../../molecule/common/test_deps - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_kernel/tasks/kernelargs.yml b/roles/edpm_kernel/tasks/kernelargs.yml index eda3bcd54..476c75db2 100644 --- a/roles/edpm_kernel/tasks/kernelargs.yml +++ b/roles/edpm_kernel/tasks/kernelargs.yml @@ -197,7 +197,7 @@ # Kernel modules loading - name: Load type1 IOMMU driver for VFIO on boot ansible.builtin.import_role: - name: edpm_module_load + name: osp.edpm.edpm_module_load vars: modules: - name: vfio_iommu_type1 diff --git a/roles/edpm_libvirt/molecule/default/converge.yml b/roles/edpm_libvirt/molecule/default/converge.yml index 479d63c2f..0ed765dfd 100644 --- a/roles/edpm_libvirt/molecule/default/converge.yml +++ b/roles/edpm_libvirt/molecule/default/converge.yml @@ -14,4 +14,4 @@ when: - ansible_user_dir is undefined roles: - - role: "edpm_libvirt" + - role: osp.edpm.edpm_libvirt diff --git a/roles/edpm_libvirt/molecule/default/prepare.yml b/roles/edpm_libvirt/molecule/default/prepare.yml index c5acdd18d..f33af7576 100644 --- a/roles/edpm_libvirt/molecule/default/prepare.yml +++ b/roles/edpm_libvirt/molecule/default/prepare.yml @@ -19,7 +19,7 @@ hosts: all roles: - role: ../../../../molecule/common/test_deps - - role: env_data + - role: osp.edpm.env_data - name: Setup DUT hosts: all @@ -33,11 +33,11 @@ - name: set timezone ansible.builtin.import_role: - name: "edpm_timezone" + name: osp.edpm.edpm_timezone - name: install podman ansible.builtin.import_role: - name: "edpm_podman" + name: osp.edpm.edpm_podman - name: Create firewall directory become: true diff --git a/roles/edpm_module_load/molecule/default/converge.yml b/roles/edpm_module_load/molecule/default/converge.yml index 8fe3dfce4..2136105ed 100644 --- a/roles/edpm_module_load/molecule/default/converge.yml +++ b/roles/edpm_module_load/molecule/default/converge.yml @@ -18,6 +18,6 @@ - name: Converge hosts: all roles: - - role: "edpm_module_load" + - role: osp.edpm.edpm_module_load modules: - name: dummy diff --git a/roles/edpm_module_load/molecule/default/prepare.yml b/roles/edpm_module_load/molecule/default/prepare.yml index edd3aacba..a5c4ea112 100644 --- a/roles/edpm_module_load/molecule/default/prepare.yml +++ b/roles/edpm_module_load/molecule/default/prepare.yml @@ -19,4 +19,4 @@ - role: ../../../../molecule/common/test_deps test_deps_extra_packages: - kmod - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_module_load/molecule/legacy_vars/converge.yml b/roles/edpm_module_load/molecule/legacy_vars/converge.yml index 8fe3dfce4..2136105ed 100644 --- a/roles/edpm_module_load/molecule/legacy_vars/converge.yml +++ b/roles/edpm_module_load/molecule/legacy_vars/converge.yml @@ -18,6 +18,6 @@ - name: Converge hosts: all roles: - - role: "edpm_module_load" + - role: osp.edpm.edpm_module_load modules: - name: dummy diff --git a/roles/edpm_module_load/molecule/legacy_vars/prepare.yml b/roles/edpm_module_load/molecule/legacy_vars/prepare.yml index ff79dfce3..778842776 100644 --- a/roles/edpm_module_load/molecule/legacy_vars/prepare.yml +++ b/roles/edpm_module_load/molecule/legacy_vars/prepare.yml @@ -21,4 +21,4 @@ - role: ../../../../molecule/common/test_deps test_deps_extra_packages: - kmod - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_module_load/molecule/remove_module/converge.yml b/roles/edpm_module_load/molecule/remove_module/converge.yml index 6b6a61544..7b0becf9f 100644 --- a/roles/edpm_module_load/molecule/remove_module/converge.yml +++ b/roles/edpm_module_load/molecule/remove_module/converge.yml @@ -18,10 +18,10 @@ - name: Converge hosts: all roles: - - role: "edpm_module_load" + - role: osp.edpm.edpm_module_load modules: - name: dummy - - role: "edpm_module_load" + - role: osp.edpm.edpm_module_load modules: - name: dummy state: absent diff --git a/roles/edpm_module_load/molecule/remove_module/prepare.yml b/roles/edpm_module_load/molecule/remove_module/prepare.yml index ff79dfce3..778842776 100644 --- a/roles/edpm_module_load/molecule/remove_module/prepare.yml +++ b/roles/edpm_module_load/molecule/remove_module/prepare.yml @@ -21,4 +21,4 @@ - role: ../../../../molecule/common/test_deps test_deps_extra_packages: - kmod - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_network_config/molecule/default/prepare.yml b/roles/edpm_network_config/molecule/default/prepare.yml index 6c461face..d1f006f0c 100644 --- a/roles/edpm_network_config/molecule/default/prepare.yml +++ b/roles/edpm_network_config/molecule/default/prepare.yml @@ -23,7 +23,7 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Ensure legacy scripts installed diff --git a/roles/edpm_network_config/molecule/nmstate/prepare.yml b/roles/edpm_network_config/molecule/nmstate/prepare.yml index f84a65f36..1e11620d9 100644 --- a/roles/edpm_network_config/molecule/nmstate/prepare.yml +++ b/roles/edpm_network_config/molecule/nmstate/prepare.yml @@ -24,4 +24,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_nftables/molecule/action/prepare.yml b/roles/edpm_nftables/molecule/action/prepare.yml index d7d4c8eeb..dd470dd35 100644 --- a/roles/edpm_nftables/molecule/action/prepare.yml +++ b/roles/edpm_nftables/molecule/action/prepare.yml @@ -25,11 +25,11 @@ vars: edpm_nftables_src: /opt/edpm-firewall roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Cleanup nftables ansible.builtin.import_role: - name: edpm_nftables + name: osp.edpm.edpm_nftables tasks_from: cleanup.yml - name: Create snippet directory become: true diff --git a/roles/edpm_nftables/molecule/default/prepare.yml b/roles/edpm_nftables/molecule/default/prepare.yml index b83ebed42..035138e71 100644 --- a/roles/edpm_nftables/molecule/default/prepare.yml +++ b/roles/edpm_nftables/molecule/default/prepare.yml @@ -22,7 +22,7 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Cleanup nftables import_role: diff --git a/roles/edpm_nftables/molecule/destination/prepare.yml b/roles/edpm_nftables/molecule/destination/prepare.yml index 22c17d54a..2d64819cf 100644 --- a/roles/edpm_nftables/molecule/destination/prepare.yml +++ b/roles/edpm_nftables/molecule/destination/prepare.yml @@ -23,7 +23,7 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Cleanup nftables vars: diff --git a/roles/edpm_nftables/molecule/source/prepare.yml b/roles/edpm_nftables/molecule/source/prepare.yml index 91f24d70a..940827ddc 100644 --- a/roles/edpm_nftables/molecule/source/prepare.yml +++ b/roles/edpm_nftables/molecule/source/prepare.yml @@ -23,7 +23,7 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Cleanup nftables import_role: diff --git a/roles/edpm_nftables/molecule/update_rules/prepare.yml b/roles/edpm_nftables/molecule/update_rules/prepare.yml index 1d7a79781..0c162fa3b 100644 --- a/roles/edpm_nftables/molecule/update_rules/prepare.yml +++ b/roles/edpm_nftables/molecule/update_rules/prepare.yml @@ -23,7 +23,7 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Cleanup nftables ansible.builtin.import_role: diff --git a/roles/edpm_nodes_validation/molecule/default/prepare.yml b/roles/edpm_nodes_validation/molecule/default/prepare.yml index 6126823e0..6345463d7 100644 --- a/roles/edpm_nodes_validation/molecule/default/prepare.yml +++ b/roles/edpm_nodes_validation/molecule/default/prepare.yml @@ -22,4 +22,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_nova/molecule/default/converge.yml b/roles/edpm_nova/molecule/default/converge.yml index 5d0c4d10c..486dab4a3 100644 --- a/roles/edpm_nova/molecule/default/converge.yml +++ b/roles/edpm_nova/molecule/default/converge.yml @@ -12,6 +12,6 @@ when: - ansible_user_dir is undefined roles: - - role: "edpm_nova" + - role: osp.edpm.edpm_nova vars: edpm_nova_config_src: "{{lookup('env', 'MOLECULE_SCENARIO_DIRECTORY')}}/test-data" diff --git a/roles/edpm_nova/molecule/default/prepare.yml b/roles/edpm_nova/molecule/default/prepare.yml index 93fc73fc5..9f2bb462d 100644 --- a/roles/edpm_nova/molecule/default/prepare.yml +++ b/roles/edpm_nova/molecule/default/prepare.yml @@ -19,7 +19,7 @@ hosts: all roles: - role: ../../../../molecule/common/test_deps - - role: env_data + - role: osp.edpm.env_data - name: Setup DUT hosts: all @@ -43,10 +43,10 @@ state: link - name: set timezone import_role: - name: "edpm_timezone" + name: osp.edpm.edpm_timezone - name: install podman import_role: - name: "edpm_podman" + name: osp.edpm.edpm_podman - name: Create firewall directory become: true ansible.builtin.file: @@ -66,4 +66,4 @@ dport: 22 - name: install libvirt import_role: - name: "edpm_libvirt" + name: osp.edpm.edpm_libvirt diff --git a/roles/edpm_nova_compute/molecule/default/prepare.yml b/roles/edpm_nova_compute/molecule/default/prepare.yml index 6d13b1503..9345a6f35 100644 --- a/roles/edpm_nova_compute/molecule/default/prepare.yml +++ b/roles/edpm_nova_compute/molecule/default/prepare.yml @@ -20,4 +20,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_nova_libvirt/resources/molecule/converge.yml b/roles/edpm_nova_libvirt/resources/molecule/converge.yml index d872fc092..aecfabf49 100644 --- a/roles/edpm_nova_libvirt/resources/molecule/converge.yml +++ b/roles/edpm_nova_libvirt/resources/molecule/converge.yml @@ -24,6 +24,6 @@ tasks: - name: Execute test case tasks include_role: - name: edpm_nova_libvirt + name: osp.edpm.edpm_nova_libvirt tasks_from: "{{ test_task | default('main.yml') }}" tags: "{{ test_tags | default(omit) }}" diff --git a/roles/edpm_nova_libvirt/resources/molecule/prepare.yml b/roles/edpm_nova_libvirt/resources/molecule/prepare.yml index 6cd9da6c9..92f1c02de 100644 --- a/roles/edpm_nova_libvirt/resources/molecule/prepare.yml +++ b/roles/edpm_nova_libvirt/resources/molecule/prepare.yml @@ -20,4 +20,4 @@ roles: - role: ../../../../molecule/common/test_deps test_deps_setup_edpm: true - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_ovn/molecule/default/prepare.yml b/roles/edpm_ovn/molecule/default/prepare.yml index d448a4760..895c13ea2 100644 --- a/roles/edpm_ovn/molecule/default/prepare.yml +++ b/roles/edpm_ovn/molecule/default/prepare.yml @@ -28,7 +28,7 @@ gather_facts: true tasks: - include_role: - name: env_data + name: osp.edpm.env_data # The openvswitch kernel module needs to be loaded on the host - name: install and modprobe openvswitch diff --git a/roles/edpm_ovn/molecule/noconfig/prepare.yml b/roles/edpm_ovn/molecule/noconfig/prepare.yml index d448a4760..895c13ea2 100644 --- a/roles/edpm_ovn/molecule/noconfig/prepare.yml +++ b/roles/edpm_ovn/molecule/noconfig/prepare.yml @@ -28,7 +28,7 @@ gather_facts: true tasks: - include_role: - name: env_data + name: osp.edpm.env_data # The openvswitch kernel module needs to be loaded on the host - name: install and modprobe openvswitch diff --git a/roles/edpm_podman/molecule/default/converge.yml b/roles/edpm_podman/molecule/default/converge.yml index 0bd9e7887..f7d797f2a 100644 --- a/roles/edpm_podman/molecule/default/converge.yml +++ b/roles/edpm_podman/molecule/default/converge.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "edpm_podman" + - role: osp.edpm.edpm_podman diff --git a/roles/edpm_podman/molecule/default/prepare.yml b/roles/edpm_podman/molecule/default/prepare.yml index 533db7fb2..8b31663dd 100644 --- a/roles/edpm_podman/molecule/default/prepare.yml +++ b/roles/edpm_podman/molecule/default/prepare.yml @@ -34,7 +34,7 @@ test_deps_extra_packages: - runc - containernetworking-plugins - - role: env_data + - role: osp.edpm.env_data post_tasks: - name: pull an image containers.podman.podman_image: diff --git a/roles/edpm_podman/molecule/install/converge.yml b/roles/edpm_podman/molecule/install/converge.yml index c82a1600e..607cc7119 100644 --- a/roles/edpm_podman/molecule/install/converge.yml +++ b/roles/edpm_podman/molecule/install/converge.yml @@ -20,7 +20,7 @@ tasks: - name: Run install include_role: - name: edpm_podman + name: osp.edpm.edpm_podman tasks_from: install.yml vars_from: "redhat.yml" # https://bugs.launchpad.net/bugs/1889510 diff --git a/roles/edpm_podman/molecule/install/prepare.yml b/roles/edpm_podman/molecule/install/prepare.yml index 14ec574cd..5b3f73777 100644 --- a/roles/edpm_podman/molecule/install/prepare.yml +++ b/roles/edpm_podman/molecule/install/prepare.yml @@ -26,4 +26,4 @@ become: true gather_facts: true roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_podman/molecule/login/converge.yml b/roles/edpm_podman/molecule/login/converge.yml index c721ea698..4e84b1c40 100644 --- a/roles/edpm_podman/molecule/login/converge.yml +++ b/roles/edpm_podman/molecule/login/converge.yml @@ -25,8 +25,8 @@ testuser: testpassword tasks: - include_role: - name: edpm_podman + name: osp.edpm.edpm_podman tasks_from: login.yml - include_role: - name: edpm_podman + name: osp.edpm.edpm_podman tasks_from: buildah_login.yml diff --git a/roles/edpm_podman/molecule/login/prepare.yml b/roles/edpm_podman/molecule/login/prepare.yml index 842b5a9d8..aaf18c449 100644 --- a/roles/edpm_podman/molecule/login/prepare.yml +++ b/roles/edpm_podman/molecule/login/prepare.yml @@ -41,7 +41,7 @@ - ansible_user_dir is undefined roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Disable SELinux @@ -88,6 +88,6 @@ - name: Run install include_role: - name: edpm_podman + name: osp.edpm.edpm_podman tasks_from: install.yml vars_from: "redhat.yml" diff --git a/roles/edpm_ssh_known_hosts/molecule/default/prepare.yml b/roles/edpm_ssh_known_hosts/molecule/default/prepare.yml index 6d028277b..45d5d28b1 100644 --- a/roles/edpm_ssh_known_hosts/molecule/default/prepare.yml +++ b/roles/edpm_ssh_known_hosts/molecule/default/prepare.yml @@ -23,4 +23,4 @@ - name: Prepare container hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_ssh_known_hosts/molecule/no_networks/prepare.yml b/roles/edpm_ssh_known_hosts/molecule/no_networks/prepare.yml index c2b860b9b..bbb8ba978 100644 --- a/roles/edpm_ssh_known_hosts/molecule/no_networks/prepare.yml +++ b/roles/edpm_ssh_known_hosts/molecule/no_networks/prepare.yml @@ -24,4 +24,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_telemetry/molecule/default/prepare.yml b/roles/edpm_telemetry/molecule/default/prepare.yml index e5c611345..a278293d1 100644 --- a/roles/edpm_telemetry/molecule/default/prepare.yml +++ b/roles/edpm_telemetry/molecule/default/prepare.yml @@ -22,7 +22,7 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data tasks: - name: Create config-data merged directory file: diff --git a/roles/edpm_timezone/molecule/default/prepare.yml b/roles/edpm_timezone/molecule/default/prepare.yml index 3ce71b58b..59c09e5dc 100644 --- a/roles/edpm_timezone/molecule/default/prepare.yml +++ b/roles/edpm_timezone/molecule/default/prepare.yml @@ -23,4 +23,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_tuned/molecule/default/prepare.yml b/roles/edpm_tuned/molecule/default/prepare.yml index af3c43210..08238fb9f 100644 --- a/roles/edpm_tuned/molecule/default/prepare.yml +++ b/roles/edpm_tuned/molecule/default/prepare.yml @@ -22,4 +22,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/edpm_tuned/molecule/isolated/prepare.yml b/roles/edpm_tuned/molecule/isolated/prepare.yml index bddaf8d7d..95d0ce316 100644 --- a/roles/edpm_tuned/molecule/isolated/prepare.yml +++ b/roles/edpm_tuned/molecule/isolated/prepare.yml @@ -23,4 +23,4 @@ - name: Prepare hosts: all roles: - - role: env_data + - role: osp.edpm.env_data diff --git a/roles/env_data/meta/argument_specs.yml b/roles/env_data/meta/argument_specs.yml index cf8080d99..a070d861e 100644 --- a/roles/env_data/meta/argument_specs.yml +++ b/roles/env_data/meta/argument_specs.yml @@ -2,7 +2,7 @@ argument_specs: # ./roles/env_data/tasks/main.yml entry point main: - short_description: The main entry point for the env_data role. + short_description: The main entry point for the osp.edpm.env_data role. description: - Role gathers information about local env and prints it as debug. - No arguments are expected or necessary. diff --git a/roles/env_data/meta/main.yml b/roles/env_data/meta/main.yml index 412a9d7d8..1a01209e4 100644 --- a/roles/env_data/meta/main.yml +++ b/roles/env_data/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: namespace: openstack author: OpenStack - description: EDPM OpenStack Role -- env_data + description: EDPM OpenStack Role -- osp.edpm.env_data company: Red Hat license: Apache-2.0 min_ansible_version: '2.9' diff --git a/roles/env_data/molecule/default/converge.yml b/roles/env_data/molecule/default/converge.yml index 63a06be97..da79d9934 100644 --- a/roles/env_data/molecule/default/converge.yml +++ b/roles/env_data/molecule/default/converge.yml @@ -18,6 +18,6 @@ - name: Converge hosts: all tasks: - - name: "Include env_data" + - name: "Include osp.edpm.env_data" ansible.builtin.include_role: name: "osp.edpm.env_data"