From f03283292445efb7a4da6674abf73a6f17f9b59b 2024-09-09 23:03:17 From: Branko Majic Date: 2024-09-09 23:03:17 Subject: [PATCH] MAR-218: Disable the boot-time hanging workaround for VirtualBox: - The workaround is most likely no longer necessary with up-to-date versions of kernel and VirtualBox (modules) themselves. --- diff --git a/roles/backup/molecule/default/molecule.yml b/roles/backup/molecule/default/molecule.yml index 180c2f03326d953cb63582e11244e1276ba80da1..d1179cb2a85b3e8c66b4a15b1df27813f82f97ac 100644 --- a/roles/backup/molecule/default/molecule.yml +++ b/roles/backup/molecule/default/molecule.yml @@ -17,14 +17,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - # @WORKAROUND: Boot-time hanging due to clock source - # Prevents the VMs from hanging during boot time, seems - # related to VirtualBox KVM-compatible clock - # implementation. Might be possible to alleviate by switching - # to VirtualBox > 6.1. Workaround needs to be removed from all - # roles/tests in that case. - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - name: parameters-optional-bookworm groups: @@ -32,8 +24,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/backup_client/molecule/default/molecule.yml b/roles/backup_client/molecule/default/molecule.yml index 25600775d8c200a2435bf035e58e749a6952b706..986b480c026bae23a05dcc840350e9433a72ea86 100644 --- a/roles/backup_client/molecule/default/molecule.yml +++ b/roles/backup_client/molecule/default/molecule.yml @@ -19,8 +19,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.10 @@ -33,8 +31,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.20 @@ -47,8 +43,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 diff --git a/roles/backup_server/molecule/default/molecule.yml b/roles/backup_server/molecule/default/molecule.yml index cb7c59d99afa602bbead2976c21940b308b73c72..8ccd0cc1c5c7ca7b5762a28c5eb12dad93b59fae 100644 --- a/roles/backup_server/molecule/default/molecule.yml +++ b/roles/backup_server/molecule/default/molecule.yml @@ -17,8 +17,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.31 @@ -31,8 +29,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.32 diff --git a/roles/bootstrap/molecule/default/molecule.yml b/roles/bootstrap/molecule/default/molecule.yml index 726492e111774d0218fa4d50c9adfdd6e46c2e22..d1179cb2a85b3e8c66b4a15b1df27813f82f97ac 100644 --- a/roles/bootstrap/molecule/default/molecule.yml +++ b/roles/bootstrap/molecule/default/molecule.yml @@ -17,8 +17,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - name: parameters-optional-bookworm groups: @@ -26,8 +24,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/common/molecule/default/molecule.yml b/roles/common/molecule/default/molecule.yml index 8aba5e8bafb58b6b082564192b7d4b58668ed689..cf926c06b17a01cfc21aea8513273b0365acd320 100644 --- a/roles/common/molecule/default/molecule.yml +++ b/roles/common/molecule/default/molecule.yml @@ -14,8 +14,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.2 @@ -34,8 +32,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.3 @@ -54,8 +50,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.4 @@ -73,8 +67,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 @@ -92,8 +84,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.22 diff --git a/roles/database/molecule/default/molecule.yml b/roles/database/molecule/default/molecule.yml index 7f84488111fd93fbbc40877487876742f23bf67e..ba4dd7958ea79e67c3a833504a61c5467c20801b 100644 --- a/roles/database/molecule/default/molecule.yml +++ b/roles/database/molecule/default/molecule.yml @@ -17,8 +17,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - name: parameters-optional-bookworm groups: @@ -27,8 +25,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/database_server/molecule/default/molecule.yml b/roles/database_server/molecule/default/molecule.yml index 984a61a37bf8fd65af50a90f0deef13b9849f106..06acfbebe6e64fd775503d2065aa9d99900dae9d 100644 --- a/roles/database_server/molecule/default/molecule.yml +++ b/roles/database_server/molecule/default/molecule.yml @@ -17,8 +17,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/ldap_client/molecule/default/molecule.yml b/roles/ldap_client/molecule/default/molecule.yml index 7250801bdd8acb2cc204317bdeadc0ef53d02aaf..e40d5de4997e86c4490529e3c52d41e3eb4671fc 100644 --- a/roles/ldap_client/molecule/default/molecule.yml +++ b/roles/ldap_client/molecule/default/molecule.yml @@ -17,8 +17,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - name: parameters-optional-bookworm groups: @@ -26,8 +24,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/ldap_server/molecule/default/molecule.yml b/roles/ldap_server/molecule/default/molecule.yml index ad314bb5859ca6b43ddf7eb53bae2b1996aef95b..ff43d52803a0286b796af858fa6d39342f445c6a 100644 --- a/roles/ldap_server/molecule/default/molecule.yml +++ b/roles/ldap_server/molecule/default/molecule.yml @@ -15,8 +15,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.11 @@ -29,8 +27,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 @@ -44,8 +40,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.22 diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml index 5709b0e4a7a56a461ae00d316afb93e85399f9e3..d567dabd47b19e11fb35d519134050000a379dee 100644 --- a/roles/mail_forwarder/molecule/default/molecule.yml +++ b/roles/mail_forwarder/molecule/default/molecule.yml @@ -22,8 +22,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.11 @@ -37,8 +35,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.12 @@ -55,8 +51,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 @@ -69,8 +63,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.22 @@ -83,8 +75,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.23 diff --git a/roles/mail_server/molecule/default/molecule.yml b/roles/mail_server/molecule/default/molecule.yml index 3b1444aba8c349ed8153ca717d3b6af5109d047a..83a08eca835aa6844fcb5f33534da3c440bae4d9 100644 --- a/roles/mail_server/molecule/default/molecule.yml +++ b/roles/mail_server/molecule/default/molecule.yml @@ -24,8 +24,6 @@ platforms: box: debian/bookworm64 memory: 768 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.11 @@ -38,8 +36,6 @@ platforms: box: debian/bookworm64 memory: 384 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.12 @@ -59,8 +55,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 @@ -76,8 +70,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.22 @@ -91,8 +83,6 @@ platforms: box: debian/bookworm64 memory: 2048 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.31 @@ -106,8 +96,6 @@ platforms: box: debian/bookworm64 memory: 2048 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.32 diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml index da1ecd3a20684adb8661359c0039e47c3a0df671..d4c56ec5a56115d4a070b9f163b08e209e1f8ed0 100644 --- a/roles/php_website/molecule/default/molecule.yml +++ b/roles/php_website/molecule/default/molecule.yml @@ -19,8 +19,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/preseed/molecule/default/molecule.yml b/roles/preseed/molecule/default/molecule.yml index 7908c5a0d291f6b763e535fefd4589be63247a56..228c9d43946ba009614e8db8c9641d862489db6a 100644 --- a/roles/preseed/molecule/default/molecule.yml +++ b/roles/preseed/molecule/default/molecule.yml @@ -17,8 +17,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - name: parameters-optional-bookworm groups: @@ -26,8 +24,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - name: parameters-optional-with-overrides-bookworm groups: @@ -35,8 +31,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml index fef985beabbf34601db30e9a14ed2bd8f6580c04..481c25637a38f22d43e05d5ea678e8222d341673 100644 --- a/roles/web_server/molecule/default/molecule.yml +++ b/roles/web_server/molecule/default/molecule.yml @@ -15,8 +15,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.11 @@ -30,8 +28,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 @@ -45,8 +41,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.22 diff --git a/roles/wsgi_website/molecule/default/molecule.yml b/roles/wsgi_website/molecule/default/molecule.yml index 0a8f60b5e97f38e3036cb00d4f93596313622108..863c847ab61be999aabdb625eb6ffbd9662dbaf6 100644 --- a/roles/wsgi_website/molecule/default/molecule.yml +++ b/roles/wsgi_website/molecule/default/molecule.yml @@ -19,8 +19,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" provisioner: name: ansible diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml index 9edd52f59df7e7dc35e93cc4bc144df0184db1f3..ccab0babd34b9aebe8c43acde56cdd4615dc0734 100644 --- a/roles/xmpp_server/molecule/default/molecule.yml +++ b/roles/xmpp_server/molecule/default/molecule.yml @@ -19,8 +19,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.11 @@ -38,8 +36,6 @@ platforms: box: debian/bookworm64 memory: 256 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.21 @@ -53,8 +49,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.31 @@ -68,8 +62,6 @@ platforms: box: debian/bookworm64 memory: 512 cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" interfaces: - auto_config: true ip: 192.168.56.32