Mercurial > repos > other > Puppet

diff manifests/templates.pp @ 401:f0ee7a16125d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to Python 3 on all platforms "system" on Ubuntu seems correct, but is still Python 2!
author IBBoard <dev@ibboard.co.uk>
date Wed, 20 Apr 2022 19:13:24 +0100
parents 2c6065b5be5e
children 76d18a918e7f
line wrap: on
line diff
--- a/manifests/templates.pp	Wed Apr 20 19:11:39 2022 +0100
+++ b/manifests/templates.pp	Wed Apr 20 19:13:24 2022 +0100
@@ -285,8 +285,6 @@
 	}
 
 	if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 {
-		$python_ver = 'python3'
-
 		# The following may possibly work to ensure a CentOS Streams install.
 		# Or it might fail for inexplicable reasons.
 		# FIXME: Should be "centos-release-stream" to migrate (provides repos), but then that gets replaced by centos-stream-release,
@@ -299,13 +297,11 @@
 			command => '/usr/bin/dnf swap centos-linux-repos centos-stream-repos; /usr/bin/dnf distro-sync -y',
 			refreshonly => true
 		}
-	} else {
-		$python_ver = 'system'
 	}
 
 	class { 'python':
 		ensure => 'present',
-		version => $python_ver,
+		version => 'python3',
 		pip => 'present',
 		use_epel => false,
 	}