diff --git a/roles/bootstrap/molecule/default/molecule.yml b/roles/bootstrap/molecule/default/molecule.yml index 9ba54e01f81e961d3111ff38eeedee55dddd9e45..c69a03b34423a616b1a415412a954ca12f3c1450 100644 --- a/roles/bootstrap/molecule/default/molecule.yml +++ b/roles/bootstrap/molecule/default/molecule.yml @@ -14,24 +14,6 @@ lint: platforms: - - name: parameters-mandatory-bullseye - groups: - - parameters-mandatory - box: debian/bullseye64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - - - name: parameters-optional-bullseye - groups: - - parameters-optional - box: debian/bullseye64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - - name: parameters-mandatory-bookworm groups: - parameters-mandatory diff --git a/roles/common/molecule/default/molecule.yml b/roles/common/molecule/default/molecule.yml index b8df3f40f471b71d135580a54524923ec794fa9e..a9ac6ddf4935e005a91bff2fead2da5ae5e00111 100644 --- a/roles/common/molecule/default/molecule.yml +++ b/roles/common/molecule/default/molecule.yml @@ -70,44 +70,6 @@ platforms: netmask: 116 type: static - - name: parameters-mandatory-bullseye - groups: - - parameters-mandatory - box: debian/bullseye64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.31 - network_name: private_network - type: static - - auto_config: true - ip: fd00::192:168:56:31 - network_name: private_network - netmask: 116 - type: static - - - name: parameters-optional-bullseye - groups: - - parameters-optional - box: debian/bullseye64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.32 - network_name: private_network - type: static - - auto_config: true - ip: fd00::192:168:56:32 - network_name: private_network - netmask: 116 - type: static - - name: parameters-mandatory-bookworm groups: - parameters-mandatory diff --git a/roles/common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml index 34e8b1a28659494f3743a480b5a469e6a2a68f98..c205858aedc3818f36d4ff1752b6c1826cf659d1 100644 --- a/roles/common/molecule/default/prepare.yml +++ b/roles/common/molecule/default/prepare.yml @@ -70,10 +70,6 @@ mode: 0644 state: present with_dict: - 192.168.56.31: parameters-mandatory-bullseye - 192.168.56.32: parameters-optional-bullseye - fd00::192:168:56:31: parameters-mandatory-bullseye - fd00::192:168:56:32: parameters-optional-bullseye 192.168.56.21: parameters-mandatory-bookworm 192.168.56.22: parameters-optional-bookworm fd00::192:168:56:21: parameters-mandatory-bookworm diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 7538388c9b4c53b04ab6ddbc2bf0c46e7e0abeb5..bee1414a286fbb5a1195c8ceff152d5247b270b2 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -113,7 +113,7 @@ owner: root group: root mode: 0640 - # Checksums: bullseye and bookworm (same) + # Checksums: bookworm when: | root_bashrc_stat.stat.checksum == "1a422a148ad225aa5ba33f8dafd2b7cfcdbd701f" @@ -422,7 +422,7 @@ with_items: - name: pipreqcheck virtualenv_path: "/var/lib/pipreqcheck/virtualenv" - virtualenv_prompt: "{% if ansible_distribution_release == 'bullseye' %}(pipreqcheck) {% else %}pipreqcheck{% endif %}" + virtualenv_prompt: "pipreqcheck" python_path: "/usr/bin/python3" creates: "/var/lib/pipreqcheck/virtualenv/bin/python3"