Skip to content

Commit bb64c36

Browse files
ekohlehelms
authored andcommitted
Replace deprecated ANSIBLE_COLLECTIONS_PATHS env var
Ansible 2.16 deprecated ANSIBLE_COLLECTIONS_PATHS while Ansible 2.19 has removed it. The replacement ANSIBLE_COLLECTIONS_PATH was added in Ansible 2.10. Debian 11 and Ubuntu 22.04 ship Ansible 2.10 while on EL we package ansible-core 2.16 ourselves so we can rely on the replacement env var.
1 parent 5a4dad2 commit bb64c36

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spec/classes/foreman_proxy__plugin__ansible_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
'export ANSIBLE_LOCAL_TEMP="/tmp"',
3636
'export ANSIBLE_HOST_KEY_CHECKING="False"',
3737
'export ANSIBLE_ROLES_PATH="/etc/ansible/roles:/usr/share/ansible/roles"',
38-
'export ANSIBLE_COLLECTIONS_PATHS="/etc/ansible/collections:/usr/share/ansible/collections"',
38+
'export ANSIBLE_COLLECTIONS_PATH="/etc/ansible/collections:/usr/share/ansible/collections"',
3939
'export FOREMAN_URL="https://foo.example.com"',
4040
'export FOREMAN_SSL_KEY="/etc/puppetlabs/puppet/ssl/private_keys/foo.example.com.pem"',
4141
'export FOREMAN_SSL_CERT="/etc/puppetlabs/puppet/ssl/certs/foo.example.com.pem"',
@@ -81,7 +81,7 @@
8181
'export ANSIBLE_LOCAL_TEMP="/tmp/ansible"',
8282
'export ANSIBLE_HOST_KEY_CHECKING="True"',
8383
'export ANSIBLE_ROLES_PATH="/etc/ansible/roles:/usr/share/ansible/roles"',
84-
'export ANSIBLE_COLLECTIONS_PATHS="/etc/ansible/collections:/usr/share/ansible/collections"',
84+
'export ANSIBLE_COLLECTIONS_PATH="/etc/ansible/collections:/usr/share/ansible/collections"',
8585
'export FOREMAN_URL="https://foo.example.com"',
8686
'export FOREMAN_SSL_KEY="/etc/puppetlabs/puppet/ssl/private_keys/foo.example.com.pem"',
8787
'export FOREMAN_SSL_CERT="/etc/puppetlabs/puppet/ssl/certs/foo.example.com.pem"',

templates/plugin/ansible.env.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export ANSIBLE_CALLBACKS_ENABLED="<%= @callback %>"
33
export ANSIBLE_LOCAL_TEMP="<%= @working_dir %>"
44
export ANSIBLE_HOST_KEY_CHECKING="<%= @host_key_checking ? 'True' : 'False' %>"
55
export ANSIBLE_ROLES_PATH="<%= @roles_path.join(':') %>"
6-
export ANSIBLE_COLLECTIONS_PATHS="<%= @collections_paths.join(':') %>"
6+
export ANSIBLE_COLLECTIONS_PATH="<%= @collections_paths.join(':') %>"
77

88
export FOREMAN_URL="<%= @foreman_url %>"
99
export FOREMAN_SSL_CERT="<%= @foreman_ssl_cert %>"

0 commit comments

Comments
 (0)