D3371.id8696.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3371.id8696.diff
View Options

	diff --git a/roles/paas-docker/monitoring/init.sls b/roles/paas-docker/monitoring/init.sls
	--- a/roles/paas-docker/monitoring/init.sls
	+++ b/roles/paas-docker/monitoring/init.sls
	@@ -7,44 +7,6 @@

	{% from "map.jinja" import dirs with context %}

	-# -------------------------------------------------------------
	-# Install a modern Python interpreter on CentOS/Rocky 7/8
	-#
	-# Our checks uses subprocess features to capture output,
	-# and as such won't work correctly on Python 3.6.
	-#
	-# Provide python3.9 as python3 is safe as:
	-# - Salt RPM package hardcode a version, e.g. #!/usr/bin/python3.6
	-# - systems scripts like dnf use #!/usr/libexec/platform-python
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-{% if grains["pythonversion"] < [3, 9] %}
	-
	-{% if grains["os_family"] == "RedHat" %}
	-epel_repositories:
	- pkg.installed:
	- - pkgs:
	- - epel-release
	- - epel-next-release
	-
	-python_packages:
	- pkg.installed:
	- - pkgs:
	- - python39
	- - python39-pyyaml
	- - python39-requests
	- - require:
	- - pkg: epel_repositories
	-
	-/etc/alternatives/python3:
	- file.symlink:
	- - target: /usr/bin/python3.9
	- - require:
	- - pkg: python_packages
	-{% endif %}
	-
	-{% endif %}
	-
	# -------------------------------------------------------------
	# Platform checks
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -