Skip to content

Commit c5319d3

Browse files
mcdonnnjjsf9k
authored andcommitted
Remove provisioner sections from molecule configurations
These `provisioner` sections are only used to set a value necessary for Debian Stretch testing. Since we removing support for Debian Stretch these sections are no longer necessary. Co-authored-by: Shane Frasier <[email protected]>
1 parent 108f55e commit c5319d3

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

molecule/default/molecule-no-systemd.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,6 @@ platforms:
4646
- image: ubuntu:jammy
4747
name: ubuntu22
4848
platform: amd64
49-
provisioner:
50-
name: ansible
51-
inventory:
52-
host_vars:
53-
debian9:
54-
# auto_legacy is still the default behavior until Ansible 2.12
55-
# is released, but Molecule overrides this and forces the use
56-
# of auto.
57-
#
58-
# In auto_legacy mode Ansible will prefer the /usr/bin/python
59-
# interpreter if it exists, while in auto mode it will prefer
60-
# the Python interpreter specified in an internal map. In
61-
# most cases we only have Python3 installed, and the internal
62-
# map specifies /usr/bin/python3, so it is immaterial whether
63-
# we use auto_legacy or auto.
64-
#
65-
# The one place where it _does_ matter is our Debian9 AKA CyHy
66-
# instances. Here the /usr/bin/python _and_ /usr/bin/python3
67-
# interpreters are both installed. In Ansible 2.10 a Debian
68-
# entry was added to the internal map, so now auto_legacy
69-
# selects the /usr/bin/python interpreter while auto selects
70-
# the /usr/bin/python3 interpreter. We want to maintain the
71-
# auto_legacy behavior in this case since CyHy is still
72-
# Python2.
73-
#
74-
# See:
75-
# * https://github.com/ansible-community/molecule/blob/3.0.8/molecule/provisioner/ansible.py#L389
76-
# * https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html#interpreter-discovery
77-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/config/base.yml#L1492-L1542
78-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/executor/interpreter_discovery.py
79-
ansible_python_interpreter: auto_legacy
8049
scenario:
8150
name: default
8251
verifier:

molecule/default/molecule-with-systemd.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -105,37 +105,6 @@ platforms:
105105
privileged: yes
106106
volumes:
107107
- /sys/fs/cgroup:/sys/fs/cgroup:rw
108-
provisioner:
109-
name: ansible
110-
inventory:
111-
host_vars:
112-
debian9-systemd:
113-
# auto_legacy is still the default behavior until Ansible 2.12
114-
# is released, but Molecule overrides this and forces the use
115-
# of auto.
116-
#
117-
# In auto_legacy mode Ansible will prefer the /usr/bin/python
118-
# interpreter if it exists, while in auto mode it will prefer
119-
# the Python interpreter specified in an internal map. In
120-
# most cases we only have Python3 installed, and the internal
121-
# map specifies /usr/bin/python3, so it is immaterial whether
122-
# we use auto_legacy or auto.
123-
#
124-
# The one place where it _does_ matter is our Debian9 AKA CyHy
125-
# instances. Here the /usr/bin/python _and_ /usr/bin/python3
126-
# interpreters are both installed. In Ansible 2.10 a Debian
127-
# entry was added to the internal map, so now auto_legacy
128-
# selects the /usr/bin/python interpreter while auto selects
129-
# the /usr/bin/python3 interpreter. We want to maintain the
130-
# auto_legacy behavior in this case since CyHy is still
131-
# Python2.
132-
#
133-
# See:
134-
# * https://github.com/ansible-community/molecule/blob/3.0.8/molecule/provisioner/ansible.py#L389
135-
# * https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html#interpreter-discovery
136-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/config/base.yml#L1492-L1542
137-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/executor/interpreter_discovery.py
138-
ansible_python_interpreter: auto_legacy
139108
scenario:
140109
name: default
141110
verifier:

0 commit comments

Comments
 (0)