Remove workaround for tox-ansible and global molecule config

[1] has been merged and released[2] in upstream tox-ansible and it is now
able to manage global molecule configuration. The workaround, which
consisted in adding the molecule driver name in each scenarios
molecule.yml files, is not necessary anymore.

This patch also removes all the relative symlink to the Dockerfile and
adds directly in the global molecule configuration file.

[1] https://github.com/ansible-community/tox-ansible/pull/89
[2] https://github.com/ansible-community/tox-ansible/releases/tag/v1.5.0

Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
Change-Id: I259c17b7a49ff5bf3476df4da399cc4b2782403d
(cherry picked from commit c551910cf5)
(cherry picked from commit f3cba823d7)
(cherry picked from commit 12dd20e3b5)
(cherry picked from commit 76eb983e98)

.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

roles/ceilometerdb_size/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

roles/ceph/molecule/ceph-ansible-installed/Dockerfile

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

roles/ceph/molecule/ceph-ansible-installed/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

roles/ceph/molecule/default/Dockerfile

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

roles/ceph/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

roles/check_for_dangling_images/molecule/default/Dockerfile

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

roles/check_for_dangling_images/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

roles/check_network_gateway/molecule/default/Dockerfile

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

roles/check_network_gateway/molecule/default/molecule.yml

@@ -2,17 +2,14 @@
 # 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 iputils
+    pkg_extras: python*setuptools python*-pyyaml iputils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     privileged: true

roles/check_rhsm_version/molecule/default/Dockerfile

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

roles/check_rhsm_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

roles/check_rhsm_version/molecule/rhsm_mismatch/Dockerfile

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

roles/check_rhsm_version/molecule/rhsm_mismatch/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

roles/check_uc_hostname/molecule/default/Dockerfile

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

roles/check_uc_hostname/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

roles/check_undercloud_conf/molecule/config_OK/Dockerfile

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

roles/check_undercloud_conf/molecule/config_OK/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

roles/check_undercloud_conf/molecule/default/Dockerfile

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

roles/check_undercloud_conf/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

roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile

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

roles/check_undercloud_conf/molecule/deprecated_drivers/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

roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile

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

roles/check_undercloud_conf/molecule/deprecated_params/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

roles/check_undercloud_conf/molecule/required_missing/Dockerfile

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

roles/check_undercloud_conf/molecule/required_missing/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

roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile

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

roles/collect_flavors_and_verify_profiles/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

roles/container_status/molecule/default/Dockerfile

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

roles/container_status/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

roles/controller_token/molecule/default/Dockerfile

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

roles/controller_token/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

roles/controller_ulimits/molecule/default/Dockerfile

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

roles/controller_ulimits/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

roles/ctlplane_ip_range/molecule/default/Dockerfile

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

roles/ctlplane_ip_range/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

roles/dhcp_validations/molecule/default/Dockerfile

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

roles/dhcp_validations/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

roles/healthcheck_service_status/molecule/default/Dockerfile

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

roles/healthcheck_service_status/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

roles/image_serve/molecule/default/Dockerfile

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

roles/image_serve/molecule/default/molecule.yml

@@ -2,9 +2,6 @@
 # inherits {REPO}/.config/molecule/config.yml
 # To override default values, please take a look at the config.yml.
 
-driver:
-  name: podman
-
 platforms:
   - name: ubi8
     hostname: ubi8
@@ -13,7 +10,7 @@ platforms:
       url: registry.access.redhat.com
     etc_hosts:
       undercloud.ctlplane.mydomain.tld: "127.0.0.1"
-    dockerfile: Dockerfile
+    dockerfile: ../../../../.config/molecule/Dockerfile
     override_command: true
     command: /sbin/init
     privileged: true

roles/ironic_boot_configuration/molecule/default/Dockerfile

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

roles/ironic_boot_configuration/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

roles/mysql_open_files_limit/molecule/default/Dockerfile

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

roles/mysql_open_files_limit/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

roles/network_environment/molecule/default/Dockerfile

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

roles/network_environment/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

roles/neutron_sanity_check/molecule/default/Dockerfile

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

roles/neutron_sanity_check/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

roles/no_op_firewall_nova_driver/molecule/default/Dockerfile

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

roles/no_op_firewall_nova_driver/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

roles/node_disks/molecule/default/Dockerfile

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

roles/node_disks/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

roles/node_health/molecule/default/Dockerfile

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

roles/node_health/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

roles/nova_event_callback/molecule/default/Dockerfile

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

roles/nova_event_callback/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

roles/nova_status/molecule/default/Dockerfile

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

roles/nova_status/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

roles/nova_svirt/molecule/default/Dockerfile

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

roles/nova_svirt/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

roles/openshift_on_openstack/molecule/default/Dockerfile

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

roles/openshift_on_openstack/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

roles/openstack_endpoints/molecule/default/Dockerfile

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

roles/openstack_endpoints/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

roles/overcloud_service_status/molecule/default/Dockerfile

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

roles/overcloud_service_status/molecule/default/molecule.yml

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

roles/overcloud_service_status/molecule/deprecated_services/Dockerfile

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

roles/overcloud_service_status/molecule/deprecated_services/molecule.yml

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

roles/overcloud_service_status/molecule/down_services/Dockerfile

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

roles/overcloud_service_status/molecule/down_services/molecule.yml

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

roles/ovs_dpdk_pmd/molecule/default/Dockerfile

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

roles/ovs_dpdk_pmd/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

roles/pacemaker_status/molecule/default/Dockerfile

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

roles/pacemaker_status/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

roles/rabbitmq_limits/molecule/default/Dockerfile

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

roles/rabbitmq_limits/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

roles/repos/molecule/default/Dockerfile

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

roles/repos/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

roles/stack_health/molecule/default/Dockerfile

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

roles/stack_health/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

roles/stonith_exists/molecule/default/Dockerfile

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

roles/stonith_exists/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

roles/switch_vlans/molecule/default/Dockerfile

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

roles/switch_vlans/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

roles/system_encoding/molecule/default/Dockerfile

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

roles/system_encoding/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

roles/tls_everywhere/molecule/default/Dockerfile

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

roles/tls_everywhere/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
     pkg_extras: python*-setuptools python*-pyyaml krb5-workstation
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

roles/undercloud_debug/molecule/default/Dockerfile

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

roles/undercloud_debug/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

roles/undercloud_disk_space/molecule/default/Dockerfile

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

roles/undercloud_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

roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile

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

roles/undercloud_heat_purge_deleted/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

roles/undercloud_process_count/molecule/default/Dockerfile

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

roles/undercloud_process_count/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

roles/undercloud_tokenflush/molecule/default/Dockerfile

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

roles/undercloud_tokenflush/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