From b72c4b7ba65cc4956888cee81f658b3da81edffb Mon Sep 17 00:00:00 2001
From: parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 9 Jan 2019 12:28:45 +0100
Subject: [PATCH] cleanup python package names

---
 config.lxc/bootcd.pkgs     | 8 +++++---
 config.lxc/devel.pkgs      | 3 ++-
 config.lxc/nodeimage.pkgs  | 6 +++---
 config.lxc/sliceimage.pkgs | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index 73b9c1c6..295c4a5d 100644
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -27,7 +27,8 @@ package: wget
 package: yum
 package: curl
 package: gzip
-package: python
+package<=f27: python
+package>=f29: python2 python-unversioned-command
 package: tar
 package: pciutils
 package: kbd
@@ -39,7 +40,8 @@ package>=f8 package>=centos5: gnupg
 package>=sl6: gnupg2
 package: nano
 package: parted
-package: pyparted
+package<=f27: pyparted
+package>=f29: python2-pyparted
 package: openssh-server
 package: openssh-clients
 package: ncftp
@@ -53,7 +55,7 @@ package: pypcilib
 package: openvpn
 #package: vim-enhanced
 package: e2fsprogs
-package: rsyslog 
+package: rsyslog
 package: strace lsof
 package: net-tools
 
diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 76cbabfe..3271217d 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -28,7 +28,8 @@ package: bison flex
 package: libtool
 package<=f21: metadata
 package: mysql mysql-devel mysql-server
-package: python python-devel
+package<=f27: python python-devel
+package>=f29: python2 python-unversioned-command python2-devel
 package: python3 python3-devel
 package: doxygen
 package: cronie
diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 665c2b1b..8ab5284d 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -28,11 +28,12 @@ package: filesystem
 package: lvm2
 package: bash
 package: coreutils
-package: python
+package<=f27: python
+package>=f29: python2 python-unversioned-command
 package: cpio
 package: e2fsprogs
 package: ed
-package: file     
+package: file
 package: glibc
 package: hdparm
 package: initscripts
@@ -89,7 +90,6 @@ package: iptables
 package: dracut
 package: ntp
 package: perl
-package: python
 package: tar
 package: expect
 package: nfs-utils
diff --git a/config.lxc/sliceimage.pkgs b/config.lxc/sliceimage.pkgs
index 47d25884..7cc1a245 100644
--- a/config.lxc/sliceimage.pkgs
+++ b/config.lxc/sliceimage.pkgs
@@ -14,7 +14,8 @@ package: crontabs logrotate passwd sudo
 package: gzip bzip2 tar rsync
 package: wget curl
 package: perl
-package: python python-devel
+package<=f27: python python-devel
+package>=f29: python2 python-unversioned-command python2-devel
 package: yum
 package: iputils
 package: tcpdump traceroute telnet
-- 
2.43.0