# HG changeset patch # User IBBoard # Date 1650478404 -3600 # Node ID f0ee7a16125d62188d1e4f03e8cfb566f25043e7 # Parent f354100b688a8f22ecf48a407c141008dc289041 Switch to Python 3 on all platforms "system" on Ubuntu seems correct, but is still Python 2! diff -r f354100b688a -r f0ee7a16125d manifests/templates.pp --- 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, }