Merge "Remove workaround for tox-ansible and global molecule config"

.config/molecule/config.yml

@@ -30,7 +30,7 @@ platforms:
     image: ubi8/ubi-init
     registry:
       url: registry.access.redhat.com
-    dockerfile: Dockerfile
+    dockerfile: ../../../../../.config/molecule/Dockerfile
     pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

validations_common/roles/advanced_format_512e_support/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/check_cpu/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/check_cpu/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/check_disk_space/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/check_disk_space/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/check_latest_packages_version/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/check_ram/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/check_ram/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/check_selinux_mode/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/check_selinux_mode/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/dns/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/dns/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/haproxy/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/haproxy/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/ntp/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/ntp/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/service_status/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/service_status/molecule/default/molecule.yml

@@ -2,16 +2,13 @@
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
 
-driver:
-  name: podman
-
 platforms:
   - name: ubi8
     hostname: ubi8
     image: ubi8/ubi-init
     registry:
       url: registry.access.redhat.com
-    dockerfile: Dockerfile
+    dockerfile: ../../../../../.config/molecule/Dockerfile
     command: /sbin/init
     pkg_extras: python*-setuptools python*-pyyaml
     volumes:

validations_common/roles/service_status/molecule/docker/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/service_status/molecule/docker/molecule.yml

@@ -11,7 +11,7 @@ platforms:
     image: ubi8/ubi-init
     registry:
       url: registry.access.redhat.com
-    dockerfile: Dockerfile
+    dockerfile: ../../../../../.config/molecule/Dockerfile
     pkg_extras: python*-setuptools python*-pyyaml python*-libselinux
     command: /sbin/init
     capabilities:

validations_common/roles/service_status/molecule/podman/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/service_status/molecule/podman/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/service_status/molecule/systemd/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/service_status/molecule/systemd/molecule.yml

@@ -2,16 +2,13 @@
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
 
-driver:
-  name: podman
-
 platforms:
   - name: ubi8
     hostname: ubi8
     image: ubi8/ubi-init
     registry:
       url: registry.access.redhat.com
-    dockerfile: Dockerfile
+    dockerfile: ../../../../../.config/molecule/Dockerfile
     pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

validations_common/roles/validate_selinux/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/validate_selinux/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman

validations_common/roles/xfs_check_ftype/molecule/default/Dockerfile

@@ -1 +0,0 @@
-../../../../../.config/molecule/Dockerfile

validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml

@@ -1,6 +1,3 @@
 ---
 # inherits tripleo-validations/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
-
-driver:
-  name: podman