diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml index f03347743..38a3af90b 100644 --- a/.config/molecule/config.yml +++ b/.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 diff --git a/roles/ceilometerdb_size/molecule/default/molecule.yml b/roles/ceilometerdb_size/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/ceilometerdb_size/molecule/default/molecule.yml +++ b/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 diff --git a/roles/ceph/molecule/ceph-ansible-installed/Dockerfile b/roles/ceph/molecule/ceph-ansible-installed/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/ceph/molecule/ceph-ansible-installed/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/ceph/molecule/ceph-ansible-installed/molecule.yml b/roles/ceph/molecule/ceph-ansible-installed/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/ceph/molecule/ceph-ansible-installed/molecule.yml +++ b/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 diff --git a/roles/ceph/molecule/default/Dockerfile b/roles/ceph/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/ceph/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/ceph/molecule/default/molecule.yml b/roles/ceph/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/ceph/molecule/default/molecule.yml +++ b/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 diff --git a/roles/check_for_dangling_images/molecule/default/Dockerfile b/roles/check_for_dangling_images/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_for_dangling_images/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_for_dangling_images/molecule/default/molecule.yml b/roles/check_for_dangling_images/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_for_dangling_images/molecule/default/molecule.yml +++ b/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 diff --git a/roles/check_network_gateway/molecule/default/Dockerfile b/roles/check_network_gateway/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_network_gateway/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_network_gateway/molecule/default/molecule.yml b/roles/check_network_gateway/molecule/default/molecule.yml index 35e35de43..ce5f8f0b9 100644 --- a/roles/check_network_gateway/molecule/default/molecule.yml +++ b/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 - pkg_extras: python*setuptools python*-PyYAML iputils + dockerfile: ../../../../.config/molecule/Dockerfile + pkg_extras: python*setuptools python*-pyyaml iputils volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true diff --git a/roles/check_rhsm_version/molecule/default/Dockerfile b/roles/check_rhsm_version/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_rhsm_version/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_rhsm_version/molecule/default/molecule.yml b/roles/check_rhsm_version/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_rhsm_version/molecule/default/molecule.yml +++ b/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 diff --git a/roles/check_rhsm_version/molecule/rhsm_mismatch/Dockerfile b/roles/check_rhsm_version/molecule/rhsm_mismatch/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_rhsm_version/molecule/rhsm_mismatch/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_rhsm_version/molecule/rhsm_mismatch/molecule.yml b/roles/check_rhsm_version/molecule/rhsm_mismatch/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_rhsm_version/molecule/rhsm_mismatch/molecule.yml +++ b/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 diff --git a/roles/check_uc_hostname/molecule/default/Dockerfile b/roles/check_uc_hostname/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_uc_hostname/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_uc_hostname/molecule/default/molecule.yml b/roles/check_uc_hostname/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_uc_hostname/molecule/default/molecule.yml +++ b/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 diff --git a/roles/check_undercloud_conf/molecule/config_OK/Dockerfile b/roles/check_undercloud_conf/molecule/config_OK/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_undercloud_conf/molecule/config_OK/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_undercloud_conf/molecule/config_OK/molecule.yml b/roles/check_undercloud_conf/molecule/config_OK/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_undercloud_conf/molecule/config_OK/molecule.yml +++ b/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 diff --git a/roles/check_undercloud_conf/molecule/default/Dockerfile b/roles/check_undercloud_conf/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_undercloud_conf/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_undercloud_conf/molecule/default/molecule.yml b/roles/check_undercloud_conf/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_undercloud_conf/molecule/default/molecule.yml +++ b/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 diff --git a/roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile b/roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml b/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml +++ b/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 diff --git a/roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile b/roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml b/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml +++ b/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 diff --git a/roles/check_undercloud_conf/molecule/required_missing/Dockerfile b/roles/check_undercloud_conf/molecule/required_missing/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/check_undercloud_conf/molecule/required_missing/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/check_undercloud_conf/molecule/required_missing/molecule.yml b/roles/check_undercloud_conf/molecule/required_missing/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/check_undercloud_conf/molecule/required_missing/molecule.yml +++ b/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 diff --git a/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile b/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/collect_flavors_and_verify_profiles/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml b/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/collect_flavors_and_verify_profiles/molecule/default/molecule.yml +++ b/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 diff --git a/roles/container_status/molecule/default/Dockerfile b/roles/container_status/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/container_status/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/container_status/molecule/default/molecule.yml b/roles/container_status/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/container_status/molecule/default/molecule.yml +++ b/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 diff --git a/roles/controller_token/molecule/default/Dockerfile b/roles/controller_token/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/controller_token/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/controller_token/molecule/default/molecule.yml b/roles/controller_token/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/controller_token/molecule/default/molecule.yml +++ b/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 diff --git a/roles/controller_ulimits/molecule/default/Dockerfile b/roles/controller_ulimits/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/controller_ulimits/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/controller_ulimits/molecule/default/molecule.yml b/roles/controller_ulimits/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/controller_ulimits/molecule/default/molecule.yml +++ b/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 diff --git a/roles/ctlplane_ip_range/molecule/default/Dockerfile b/roles/ctlplane_ip_range/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/ctlplane_ip_range/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/ctlplane_ip_range/molecule/default/molecule.yml b/roles/ctlplane_ip_range/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/ctlplane_ip_range/molecule/default/molecule.yml +++ b/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 diff --git a/roles/dhcp_validations/molecule/default/Dockerfile b/roles/dhcp_validations/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/dhcp_validations/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/dhcp_validations/molecule/default/molecule.yml b/roles/dhcp_validations/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/dhcp_validations/molecule/default/molecule.yml +++ b/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 diff --git a/roles/healthcheck_service_status/molecule/default/Dockerfile b/roles/healthcheck_service_status/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/healthcheck_service_status/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/healthcheck_service_status/molecule/default/molecule.yml b/roles/healthcheck_service_status/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/healthcheck_service_status/molecule/default/molecule.yml +++ b/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 diff --git a/roles/image_serve/molecule/default/Dockerfile b/roles/image_serve/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/image_serve/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/image_serve/molecule/default/molecule.yml b/roles/image_serve/molecule/default/molecule.yml index 5f93a247a..fd92c9a26 100644 --- a/roles/image_serve/molecule/default/molecule.yml +++ b/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 diff --git a/roles/ironic_boot_configuration/molecule/default/Dockerfile b/roles/ironic_boot_configuration/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/ironic_boot_configuration/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/ironic_boot_configuration/molecule/default/molecule.yml b/roles/ironic_boot_configuration/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/ironic_boot_configuration/molecule/default/molecule.yml +++ b/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 diff --git a/roles/mysql_open_files_limit/molecule/default/Dockerfile b/roles/mysql_open_files_limit/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/mysql_open_files_limit/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/mysql_open_files_limit/molecule/default/molecule.yml b/roles/mysql_open_files_limit/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/mysql_open_files_limit/molecule/default/molecule.yml +++ b/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 diff --git a/roles/network_environment/molecule/default/Dockerfile b/roles/network_environment/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/network_environment/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/network_environment/molecule/default/molecule.yml b/roles/network_environment/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/network_environment/molecule/default/molecule.yml +++ b/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 diff --git a/roles/neutron_sanity_check/molecule/default/Dockerfile b/roles/neutron_sanity_check/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/neutron_sanity_check/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/neutron_sanity_check/molecule/default/molecule.yml b/roles/neutron_sanity_check/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/neutron_sanity_check/molecule/default/molecule.yml +++ b/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 diff --git a/roles/no_op_firewall_nova_driver/molecule/default/Dockerfile b/roles/no_op_firewall_nova_driver/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/no_op_firewall_nova_driver/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml b/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml +++ b/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 diff --git a/roles/node_disks/molecule/default/Dockerfile b/roles/node_disks/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/node_disks/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/node_disks/molecule/default/molecule.yml b/roles/node_disks/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/node_disks/molecule/default/molecule.yml +++ b/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 diff --git a/roles/node_health/molecule/default/Dockerfile b/roles/node_health/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/node_health/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/node_health/molecule/default/molecule.yml b/roles/node_health/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/node_health/molecule/default/molecule.yml +++ b/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 diff --git a/roles/nova_event_callback/molecule/default/Dockerfile b/roles/nova_event_callback/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/nova_event_callback/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/nova_event_callback/molecule/default/molecule.yml b/roles/nova_event_callback/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/nova_event_callback/molecule/default/molecule.yml +++ b/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 diff --git a/roles/nova_status/molecule/default/Dockerfile b/roles/nova_status/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/nova_status/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/nova_status/molecule/default/molecule.yml b/roles/nova_status/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/nova_status/molecule/default/molecule.yml +++ b/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 diff --git a/roles/nova_svirt/molecule/default/Dockerfile b/roles/nova_svirt/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/nova_svirt/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/nova_svirt/molecule/default/molecule.yml b/roles/nova_svirt/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/nova_svirt/molecule/default/molecule.yml +++ b/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 diff --git a/roles/openshift_on_openstack/molecule/default/Dockerfile b/roles/openshift_on_openstack/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/openshift_on_openstack/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/openshift_on_openstack/molecule/default/molecule.yml b/roles/openshift_on_openstack/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/openshift_on_openstack/molecule/default/molecule.yml +++ b/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 diff --git a/roles/openstack_endpoints/molecule/default/Dockerfile b/roles/openstack_endpoints/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/openstack_endpoints/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/openstack_endpoints/molecule/default/molecule.yml b/roles/openstack_endpoints/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/openstack_endpoints/molecule/default/molecule.yml +++ b/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 diff --git a/roles/overcloud_service_status/molecule/default/Dockerfile b/roles/overcloud_service_status/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/overcloud_service_status/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/overcloud_service_status/molecule/default/molecule.yml b/roles/overcloud_service_status/molecule/default/molecule.yml index ab23f42de..5ac29d973 100644 --- a/roles/overcloud_service_status/molecule/default/molecule.yml +++ b/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: diff --git a/roles/overcloud_service_status/molecule/deprecated_services/Dockerfile b/roles/overcloud_service_status/molecule/deprecated_services/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/overcloud_service_status/molecule/deprecated_services/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/overcloud_service_status/molecule/deprecated_services/molecule.yml b/roles/overcloud_service_status/molecule/deprecated_services/molecule.yml index ab23f42de..5ac29d973 100644 --- a/roles/overcloud_service_status/molecule/deprecated_services/molecule.yml +++ b/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: diff --git a/roles/overcloud_service_status/molecule/down_services/Dockerfile b/roles/overcloud_service_status/molecule/down_services/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/overcloud_service_status/molecule/down_services/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/overcloud_service_status/molecule/down_services/molecule.yml b/roles/overcloud_service_status/molecule/down_services/molecule.yml index ab23f42de..5ac29d973 100644 --- a/roles/overcloud_service_status/molecule/down_services/molecule.yml +++ b/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: diff --git a/roles/ovs_dpdk_pmd/molecule/default/Dockerfile b/roles/ovs_dpdk_pmd/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/ovs_dpdk_pmd/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/ovs_dpdk_pmd/molecule/default/molecule.yml b/roles/ovs_dpdk_pmd/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/ovs_dpdk_pmd/molecule/default/molecule.yml +++ b/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 diff --git a/roles/pacemaker_status/molecule/default/Dockerfile b/roles/pacemaker_status/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/pacemaker_status/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/pacemaker_status/molecule/default/molecule.yml b/roles/pacemaker_status/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/pacemaker_status/molecule/default/molecule.yml +++ b/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 diff --git a/roles/rabbitmq_limits/molecule/default/Dockerfile b/roles/rabbitmq_limits/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/rabbitmq_limits/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/rabbitmq_limits/molecule/default/molecule.yml b/roles/rabbitmq_limits/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/rabbitmq_limits/molecule/default/molecule.yml +++ b/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 diff --git a/roles/repos/molecule/default/Dockerfile b/roles/repos/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/repos/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/repos/molecule/default/molecule.yml b/roles/repos/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/repos/molecule/default/molecule.yml +++ b/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 diff --git a/roles/stack_health/molecule/default/Dockerfile b/roles/stack_health/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/stack_health/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/stack_health/molecule/default/molecule.yml b/roles/stack_health/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/stack_health/molecule/default/molecule.yml +++ b/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 diff --git a/roles/stonith_exists/molecule/default/Dockerfile b/roles/stonith_exists/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/stonith_exists/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/stonith_exists/molecule/default/molecule.yml b/roles/stonith_exists/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/stonith_exists/molecule/default/molecule.yml +++ b/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 diff --git a/roles/switch_vlans/molecule/default/Dockerfile b/roles/switch_vlans/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/switch_vlans/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/switch_vlans/molecule/default/molecule.yml b/roles/switch_vlans/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/switch_vlans/molecule/default/molecule.yml +++ b/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 diff --git a/roles/system_encoding/molecule/default/Dockerfile b/roles/system_encoding/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/system_encoding/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/system_encoding/molecule/default/molecule.yml b/roles/system_encoding/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/system_encoding/molecule/default/molecule.yml +++ b/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 diff --git a/roles/tls_everywhere/molecule/default/Dockerfile b/roles/tls_everywhere/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/tls_everywhere/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/tls_everywhere/molecule/default/molecule.yml b/roles/tls_everywhere/molecule/default/molecule.yml index f3ec99abc..2b655b87f 100644 --- a/roles/tls_everywhere/molecule/default/molecule.yml +++ b/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 diff --git a/roles/undercloud_debug/molecule/default/Dockerfile b/roles/undercloud_debug/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/undercloud_debug/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/undercloud_debug/molecule/default/molecule.yml b/roles/undercloud_debug/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/undercloud_debug/molecule/default/molecule.yml +++ b/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 diff --git a/roles/undercloud_disk_space/molecule/default/Dockerfile b/roles/undercloud_disk_space/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/undercloud_disk_space/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/undercloud_disk_space/molecule/default/molecule.yml b/roles/undercloud_disk_space/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/undercloud_disk_space/molecule/default/molecule.yml +++ b/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 diff --git a/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile b/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml b/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml +++ b/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 diff --git a/roles/undercloud_process_count/molecule/default/Dockerfile b/roles/undercloud_process_count/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/undercloud_process_count/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/undercloud_process_count/molecule/default/molecule.yml b/roles/undercloud_process_count/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/undercloud_process_count/molecule/default/molecule.yml +++ b/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 diff --git a/roles/undercloud_tokenflush/molecule/default/Dockerfile b/roles/undercloud_tokenflush/molecule/default/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/undercloud_tokenflush/molecule/default/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/undercloud_tokenflush/molecule/default/molecule.yml b/roles/undercloud_tokenflush/molecule/default/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/undercloud_tokenflush/molecule/default/molecule.yml +++ b/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 diff --git a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile deleted file mode 120000 index 2646ed3e1..000000000 --- a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../../.config/molecule/Dockerfile \ No newline at end of file diff --git a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml index 76b166415..ba05cf07d 100644 --- a/roles/undercloud_tokenflush/molecule/non-persistent-token-format/molecule.yml +++ b/roles/undercloud_tokenflush/molecule/non-persistent-token-format/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