Merge pull request #321 from jpodivin/explicitpath

Setting FQNs in molecule tests
openstack-k8s-operators · Sep 20, 2023 · 25ce3da · 25ce3da
2 parents f12c044 + 1f433f4
commit 25ce3da
Show file tree

Hide file tree

Showing 60 changed files with 72 additions and 72 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,15 +24,15 @@
      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
         cmdline:
           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
@@ -24,15 +24,15 @@
      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
         cmdline:
           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
@@ -24,15 +24,15 @@
       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
         cmdline:
           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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,4 +20,4 @@
   roles:
     - role: ../../../../molecule/common/test_deps
       test_deps_setup_edpm: true
-    - role: env_data
+    - role: osp.edpm.env_data