summaryrefslogtreecommitdiffstats
path: root/roles/kube_nfs_volumes
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-12-20 14:54:43 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-12-20 16:05:49 -0500
commit4cdc771f8e04f88ac47dd194da03dadfa2fdba2d (patch)
tree3e394b3da742faaa0d5d97dd0a74d4efd03c6567 /roles/kube_nfs_volumes
parent3e5f3380ccacc654450924fca830b93fda6c7592 (diff)
downloadopenshift-4cdc771f8e04f88ac47dd194da03dadfa2fdba2d.tar.gz
openshift-4cdc771f8e04f88ac47dd194da03dadfa2fdba2d.tar.bz2
openshift-4cdc771f8e04f88ac47dd194da03dadfa2fdba2d.tar.xz
openshift-4cdc771f8e04f88ac47dd194da03dadfa2fdba2d.zip
python3 support, add tox for better local testing against multiple python versions
Diffstat (limited to 'roles/kube_nfs_volumes')
-rw-r--r--roles/kube_nfs_volumes/library/partitionpool.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/kube_nfs_volumes/library/partitionpool.py b/roles/kube_nfs_volumes/library/partitionpool.py
index 2cd454274..1857433c7 100644
--- a/roles/kube_nfs_volumes/library/partitionpool.py
+++ b/roles/kube_nfs_volumes/library/partitionpool.py
@@ -3,6 +3,8 @@
Ansible module for partitioning.
"""
+from __future__ import print_function
+
# There is no pyparted on our Jenkins worker
# pylint: disable=import-error
import parted
@@ -131,7 +133,7 @@ def partition(diskname, specs, force=False, check_mode=False):
disk = None
if disk and len(disk.partitions) > 0 and not force:
- print "skipping", diskname
+ print("skipping", diskname)
return 0
# create new partition table, wiping all existing data
@@ -220,7 +222,7 @@ def main():
try:
specs = parse_spec(sizes)
- except ValueError, ex:
+ except ValueError as ex:
err = "Error parsing sizes=" + sizes + ": " + str(ex)
module.fail_json(msg=err)
@@ -229,7 +231,7 @@ def main():
for disk in disks.split(","):
try:
changed_count += partition(disk, specs, force, module.check_mode)
- except Exception, ex:
+ except Exception as ex:
err = "Error creating partitions on " + disk + ": " + str(ex)
raise
# module.fail_json(msg=err)