openstack
/
tripleo-validations
Code Issues Proposed changes

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)
This commit is contained in:
Gael Chamoulaud (Strider) 2021-05-17 09:13:26 +02:00
parent 98cdbd03db
commit f3cba823d7
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
107 changed files with 4 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/molecule/config.yml
View File

@ -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

1
roles/ceph/molecule/ceph-ansible-installed/Dockerfile
View File

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

3
roles/ceph/molecule/ceph-ansible-installed/molecule.yml
View File

@ -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

1
roles/ceph/molecule/default/Dockerfile
View File

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

3
roles/ceph/molecule/default/molecule.yml
View File

@ -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

1
roles/check_for_dangling_images/molecule/default/Dockerfile
View File

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

3
roles/check_for_dangling_images/molecule/default/molecule.yml
View File

@ -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

1
roles/check_kernel_version/molecule/default/Dockerfile
View File

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

3
roles/check_kernel_version/molecule/default/molecule.yml
View File

@ -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

1
roles/check_network_gateway/molecule/default/Dockerfile
View File

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

5
roles/check_network_gateway/molecule/default/molecule.yml
View File

@ -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 iputils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

1
roles/check_rhsm_version/molecule/default/Dockerfile
View File

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

3
roles/check_rhsm_version/molecule/default/molecule.yml
View File

@ -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

1
roles/check_rhsm_version/molecule/rhsm_mismatch/Dockerfile
View File

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

3
roles/check_rhsm_version/molecule/rhsm_mismatch/molecule.yml
View File

@ -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

1
roles/check_uc_hostname/molecule/default/Dockerfile
View File

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

3
roles/check_uc_hostname/molecule/default/molecule.yml
View File

@ -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

1
roles/check_undercloud_conf/molecule/config_OK/Dockerfile
View File

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

3
roles/check_undercloud_conf/molecule/config_OK/molecule.yml
View File

@ -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

1
roles/check_undercloud_conf/molecule/default/Dockerfile
View File

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

3
roles/check_undercloud_conf/molecule/default/molecule.yml
View File

@ -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

1
roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile
View File

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

3
roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml
View File

@ -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

1
roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile
View File

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

3
roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml
View File

@ -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

1
roles/check_undercloud_conf/molecule/required_missing/Dockerfile
View File

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

3
roles/check_undercloud_conf/molecule/required_missing/molecule.yml
View File

@ -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

1
roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile
View File

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

3
roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml
View File

@ -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

1
roles/container_status/molecule/default/Dockerfile
View File

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

3
roles/container_status/molecule/default/molecule.yml
View File

@ -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

1
roles/controller_token/molecule/default/Dockerfile
View File

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

3
roles/controller_token/molecule/default/molecule.yml
View File

@ -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

1
roles/controller_ulimits/molecule/default/Dockerfile
View File

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

3
roles/controller_ulimits/molecule/default/molecule.yml
View File

@ -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

1
roles/ctlplane_ip_range/molecule/default/Dockerfile
View File

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

3
roles/ctlplane_ip_range/molecule/default/molecule.yml
View File

@ -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

1
roles/dhcp_validations/molecule/default/Dockerfile
View File

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

3
roles/dhcp_validations/molecule/default/molecule.yml
View File

@ -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

1
roles/frr_status/molecule/default/Dockerfile
View File

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

3
roles/frr_status/molecule/default/molecule.yml
View File

@ -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

1
roles/frr_status/molecule/faulty/Dockerfile
View File

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

3
roles/frr_status/molecule/faulty/molecule.yml
View File

@ -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

1
roles/healthcheck_service_status/molecule/default/Dockerfile
View File

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

3
roles/healthcheck_service_status/molecule/default/molecule.yml
View File

@ -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

1
roles/image_serve/molecule/default/Dockerfile
View File

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

5
roles/image_serve/molecule/default/molecule.yml
View File

@ -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

1
roles/ironic_boot_configuration/molecule/default/Dockerfile
View File

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

3
roles/ironic_boot_configuration/molecule/default/molecule.yml
View File

@ -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

1
roles/mysql_open_files_limit/molecule/default/Dockerfile
View File

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

3
roles/mysql_open_files_limit/molecule/default/molecule.yml
View File

@ -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

1
roles/network_environment/molecule/default/Dockerfile
View File

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

3
roles/network_environment/molecule/default/molecule.yml
View File

@ -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

1
roles/neutron_sanity_check/molecule/default/Dockerfile
View File

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

3
roles/neutron_sanity_check/molecule/default/molecule.yml
View File

@ -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

1
roles/node_disks/molecule/default/Dockerfile
View File

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

3
roles/node_disks/molecule/default/molecule.yml
View File

@ -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

1
roles/node_health/molecule/default/Dockerfile
View File

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

3
roles/node_health/molecule/default/molecule.yml
View File

@ -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

1
roles/nova_event_callback/molecule/default/Dockerfile
View File

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

3
roles/nova_event_callback/molecule/default/molecule.yml
View File

@ -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

1
roles/nova_status/molecule/default/Dockerfile
View File

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

3
roles/nova_status/molecule/default/molecule.yml
View File

@ -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

1
roles/nova_svirt/molecule/default/Dockerfile
View File

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

3
roles/nova_svirt/molecule/default/molecule.yml
View File

@ -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

1
roles/openshift_on_openstack/molecule/default/Dockerfile
View File

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

3
roles/openshift_on_openstack/molecule/default/molecule.yml
View File

@ -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

1
roles/openstack_endpoints/molecule/default/Dockerfile
View File

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

3
roles/openstack_endpoints/molecule/default/molecule.yml
View File

@ -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

1
roles/overcloud_service_status/molecule/default/Dockerfile
View File

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

3
roles/overcloud_service_status/molecule/default/molecule.yml
View File

@ -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:

1
roles/overcloud_service_status/molecule/deprecated_services/Dockerfile
View File

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

3
roles/overcloud_service_status/molecule/deprecated_services/molecule.yml
View File

@ -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:

1
roles/overcloud_service_status/molecule/down_services/Dockerfile
View File

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

3
roles/overcloud_service_status/molecule/down_services/molecule.yml
View File

@ -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:

1
roles/ovs_dpdk_pmd/molecule/default/Dockerfile
View File

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

3
roles/ovs_dpdk_pmd/molecule/default/molecule.yml
View File

@ -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

1
roles/pacemaker_status/molecule/default/Dockerfile
View File

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

3
roles/pacemaker_status/molecule/default/molecule.yml
View File

@ -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

1
roles/package_version/molecule/default/Dockerfile
View File

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

3
roles/package_version/molecule/default/molecule.yml
View File

@ -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

1
roles/rabbitmq_limits/molecule/default/Dockerfile
View File

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

3
roles/rabbitmq_limits/molecule/default/molecule.yml
View File

@ -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

1
roles/repos/molecule/default/Dockerfile
View File

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

3
roles/repos/molecule/default/molecule.yml
View File

@ -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

1
roles/stack_health/molecule/default/Dockerfile
View File

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

3
roles/stack_health/molecule/default/molecule.yml
View File

@ -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

1
roles/stonith_exists/molecule/default/Dockerfile
View File

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

3
roles/stonith_exists/molecule/default/molecule.yml
View File

@ -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

1
roles/switch_vlans/molecule/default/Dockerfile
View File

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

3
roles/switch_vlans/molecule/default/molecule.yml
View File

@ -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

1
roles/system_encoding/molecule/default/Dockerfile
View File

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

3
roles/system_encoding/molecule/default/molecule.yml
View File

@ -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

1
roles/tls_everywhere/molecule/default/Dockerfile
View File

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

5
roles/tls_everywhere/molecule/default/molecule.yml
View File

@ -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

1
roles/undercloud_debug/molecule/default/Dockerfile
View File

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

3
roles/undercloud_debug/molecule/default/molecule.yml
View File

@ -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

1
roles/undercloud_disk_space/molecule/default/Dockerfile
View File

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

3
roles/undercloud_disk_space/molecule/default/molecule.yml
View File

@ -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

1
roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile
View File

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

Some files were not shown because too many files have changed in this diff Show More