From 44d6bde3ff172f80f5300fc71675aacfc0627dc0 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Mon, 23 Sep 2019 11:04:52 -0400
Subject: [PATCH] Make /usr/bin/env python point to python2

Same as before, more RHEL8 compatibility changes
---
 confluent_client/bin/collate                       | 2 +-
 confluent_client/bin/confetty                      | 2 +-
 confluent_client/bin/confluent2ansible             | 2 +-
 confluent_client/bin/confluent2lxca                | 2 +-
 confluent_client/bin/confluent2xcat                | 2 +-
 confluent_client/bin/nodeattrib                    | 4 ++--
 confluent_client/bin/nodebmcreset                  | 2 +-
 confluent_client/bin/nodeboot                      | 2 +-
 confluent_client/bin/nodeconfig                    | 2 +-
 confluent_client/bin/nodeconsole                   | 2 +-
 confluent_client/bin/nodedefine                    | 4 ++--
 confluent_client/bin/nodediscover                  | 2 +-
 confluent_client/bin/nodegroupattrib               | 4 ++--
 confluent_client/bin/nodegroupdefine               | 4 ++--
 confluent_client/bin/nodegrouplist                 | 2 +-
 confluent_client/bin/nodegroupremove               | 4 ++--
 confluent_client/bin/nodegrouprename               | 2 +-
 confluent_client/bin/nodehealth                    | 2 +-
 confluent_client/bin/nodeidentify                  | 2 +-
 confluent_client/bin/nodelist                      | 2 +-
 confluent_client/bin/nodepower                     | 4 ++--
 confluent_client/bin/noderemove                    | 4 ++--
 confluent_client/bin/noderename                    | 2 +-
 confluent_client/bin/nodereseat                    | 2 +-
 confluent_client/bin/nodersync                     | 2 +-
 confluent_client/bin/noderun                       | 2 +-
 confluent_client/bin/nodesensors                   | 2 +-
 confluent_client/bin/nodesetboot                   | 2 +-
 confluent_client/bin/nodeshell                     | 2 +-
 confluent_client/bin/stats                         | 2 +-
 confluent_client/samples/nodeattrib_from_switch.py | 2 +-
 confluent_server/bin/collective                    | 2 +-
 confluent_server/bin/confluent                     | 2 +-
 confluent_server/bin/confluentdbutil               | 2 +-
 confluent_server/bin/confluentsrv.py               | 2 +-
 confluent_server/confluentdbgcli.py                | 2 +-
 confluent_server/dbgtools/confluentdbgcli.py       | 2 +-
 confluent_server/dbgtools/processhangtraces.py     | 2 +-
 misc/disablepasscomplexity.py                      | 2 +-
 misc/fixexpiry.py                                  | 2 +-
 misc/fixsmmexpiry.py                               | 2 +-
 41 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/confluent_client/bin/collate b/confluent_client/bin/collate
index 0efa9ffd..45cc5f69 100755
--- a/confluent_client/bin/collate
+++ b/confluent_client/bin/collate
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
diff --git a/confluent_client/bin/confetty b/confluent_client/bin/confetty
index 277384d2..522fbb22 100755
--- a/confluent_client/bin/confetty
+++ b/confluent_client/bin/confetty
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
diff --git a/confluent_client/bin/confluent2ansible b/confluent_client/bin/confluent2ansible
index d0c8597f..e6da2050 100644
--- a/confluent_client/bin/confluent2ansible
+++ b/confluent_client/bin/confluent2ansible
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 import optparse
 import signal
 import sys
diff --git a/confluent_client/bin/confluent2lxca b/confluent_client/bin/confluent2lxca
index 0f8a58a5..905efb0e 100644
--- a/confluent_client/bin/confluent2lxca
+++ b/confluent_client/bin/confluent2lxca
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 import csv
 import optparse
 import signal
diff --git a/confluent_client/bin/confluent2xcat b/confluent_client/bin/confluent2xcat
index 9ee8caaa..91e42028 100644
--- a/confluent_client/bin/confluent2xcat
+++ b/confluent_client/bin/confluent2xcat
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 import csv
 import optparse
 import signal
diff --git a/confluent_client/bin/nodeattrib b/confluent_client/bin/nodeattrib
index 61e1a25e..3489bb8b 100755
--- a/confluent_client/bin/nodeattrib
+++ b/confluent_client/bin/nodeattrib
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -128,4 +128,4 @@ else:
         else:
             print(res['item']['href'].replace('/', ''))
 
-sys.exit(exitcode)
\ No newline at end of file
+sys.exit(exitcode)
diff --git a/confluent_client/bin/nodebmcreset b/confluent_client/bin/nodebmcreset
index e662ec64..eb7ef477 100755
--- a/confluent_client/bin/nodebmcreset
+++ b/confluent_client/bin/nodebmcreset
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodeboot b/confluent_client/bin/nodeboot
index a39e4c42..73c44b7b 100755
--- a/confluent_client/bin/nodeboot
+++ b/confluent_client/bin/nodeboot
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
diff --git a/confluent_client/bin/nodeconfig b/confluent_client/bin/nodeconfig
index 5b752826..89e65702 100755
--- a/confluent_client/bin/nodeconfig
+++ b/confluent_client/bin/nodeconfig
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
diff --git a/confluent_client/bin/nodeconsole b/confluent_client/bin/nodeconsole
index 31e45ad0..4f7d7b76 100755
--- a/confluent_client/bin/nodeconsole
+++ b/confluent_client/bin/nodeconsole
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
diff --git a/confluent_client/bin/nodedefine b/confluent_client/bin/nodedefine
index 3ea1fbcc..6e56722a 100755
--- a/confluent_client/bin/nodedefine
+++ b/confluent_client/bin/nodedefine
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -55,4 +55,4 @@ for r in session.create('/noderange/', attribs):
         exitcode |= 1
     if 'created' in r:
         print('{0}: created'.format(r['created']))
-sys.exit(exitcode)
\ No newline at end of file
+sys.exit(exitcode)
diff --git a/confluent_client/bin/nodediscover b/confluent_client/bin/nodediscover
index c045f20c..29982411 100755
--- a/confluent_client/bin/nodediscover
+++ b/confluent_client/bin/nodediscover
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
diff --git a/confluent_client/bin/nodegroupattrib b/confluent_client/bin/nodegroupattrib
index 3daf0fe6..b913a9c8 100755
--- a/confluent_client/bin/nodegroupattrib
+++ b/confluent_client/bin/nodegroupattrib
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -125,4 +125,4 @@ else:
         else:
             print res['item']['href'].replace('/', '')
 
-sys.exit(exitcode)
\ No newline at end of file
+sys.exit(exitcode)
diff --git a/confluent_client/bin/nodegroupdefine b/confluent_client/bin/nodegroupdefine
index 068f86ad..6fd1f8a5 100755
--- a/confluent_client/bin/nodegroupdefine
+++ b/confluent_client/bin/nodegroupdefine
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -55,4 +55,4 @@ for r in session.create('/nodegroups/', attribs):
         exitcode |= 1
     if 'created' in r:
         print('{0}: created'.format(r['created']))
-sys.exit(exitcode)
\ No newline at end of file
+sys.exit(exitcode)
diff --git a/confluent_client/bin/nodegrouplist b/confluent_client/bin/nodegrouplist
index baeb17a6..e24a45c5 100644
--- a/confluent_client/bin/nodegrouplist
+++ b/confluent_client/bin/nodegrouplist
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodegroupremove b/confluent_client/bin/nodegroupremove
index 1c7c8d3f..e06d09e0 100755
--- a/confluent_client/bin/nodegroupremove
+++ b/confluent_client/bin/nodegroupremove
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -49,4 +49,4 @@ for r in session.delete('/nodegroups/{0}'.format(noderange)):
         exitcode |= 1
     if 'deleted' in r:
         print('{0}: deleted'.format(r['deleted']))
-sys.exit(exitcode)
\ No newline at end of file
+sys.exit(exitcode)
diff --git a/confluent_client/bin/nodegrouprename b/confluent_client/bin/nodegrouprename
index 55429046..33f25803 100644
--- a/confluent_client/bin/nodegrouprename
+++ b/confluent_client/bin/nodegrouprename
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2019 Lenovo
diff --git a/confluent_client/bin/nodehealth b/confluent_client/bin/nodehealth
index 1896c18e..2dc844da 100755
--- a/confluent_client/bin/nodehealth
+++ b/confluent_client/bin/nodehealth
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodeidentify b/confluent_client/bin/nodeidentify
index 32f7f82f..73e4fa86 100755
--- a/confluent_client/bin/nodeidentify
+++ b/confluent_client/bin/nodeidentify
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodelist b/confluent_client/bin/nodelist
index 39c07c93..b6892e53 100755
--- a/confluent_client/bin/nodelist
+++ b/confluent_client/bin/nodelist
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodepower b/confluent_client/bin/nodepower
index 10378a1b..13b5e5d5 100755
--- a/confluent_client/bin/nodepower
+++ b/confluent_client/bin/nodepower
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -72,4 +72,4 @@ if options.previous:
     # add dictionary to session
     session.add_precede_dict(prev)
 
-sys.exit(session.simple_noderange_command(noderange, '/power/state', setstate))
\ No newline at end of file
+sys.exit(session.simple_noderange_command(noderange, '/power/state', setstate))
diff --git a/confluent_client/bin/noderemove b/confluent_client/bin/noderemove
index c4615a36..7cde4247 100755
--- a/confluent_client/bin/noderemove
+++ b/confluent_client/bin/noderemove
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -49,4 +49,4 @@ for r in session.delete('/noderange/{0}'.format(noderange)):
         exitcode |= 1
     if 'deleted' in r:
         print('{0}: deleted'.format(r['deleted']))
-sys.exit(exitcode)
\ No newline at end of file
+sys.exit(exitcode)
diff --git a/confluent_client/bin/noderename b/confluent_client/bin/noderename
index 3308a293..f0f26770 100644
--- a/confluent_client/bin/noderename
+++ b/confluent_client/bin/noderename
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2019 Lenovo
diff --git a/confluent_client/bin/nodereseat b/confluent_client/bin/nodereseat
index e838e42d..7bfc221f 100755
--- a/confluent_client/bin/nodereseat
+++ b/confluent_client/bin/nodereseat
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodersync b/confluent_client/bin/nodersync
index 2d1802af..2d6e91cf 100755
--- a/confluent_client/bin/nodersync
+++ b/confluent_client/bin/nodersync
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
diff --git a/confluent_client/bin/noderun b/confluent_client/bin/noderun
index c931a548..b199135b 100755
--- a/confluent_client/bin/noderun
+++ b/confluent_client/bin/noderun
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
diff --git a/confluent_client/bin/nodesensors b/confluent_client/bin/nodesensors
index 6c13cc74..5e5b1746 100755
--- a/confluent_client/bin/nodesensors
+++ b/confluent_client/bin/nodesensors
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
diff --git a/confluent_client/bin/nodesetboot b/confluent_client/bin/nodesetboot
index 1ec19099..9963208e 100755
--- a/confluent_client/bin/nodesetboot
+++ b/confluent_client/bin/nodesetboot
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
diff --git a/confluent_client/bin/nodeshell b/confluent_client/bin/nodeshell
index 779bec7d..27ca5ad8 100755
--- a/confluent_client/bin/nodeshell
+++ b/confluent_client/bin/nodeshell
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
diff --git a/confluent_client/bin/stats b/confluent_client/bin/stats
index 39463f90..c9231a43 100755
--- a/confluent_client/bin/stats
+++ b/confluent_client/bin/stats
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2019 Lenovo
diff --git a/confluent_client/samples/nodeattrib_from_switch.py b/confluent_client/samples/nodeattrib_from_switch.py
index b8e88ec3..eff3e394 100644
--- a/confluent_client/samples/nodeattrib_from_switch.py
+++ b/confluent_client/samples/nodeattrib_from_switch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 # This is a sample python script for going through all observed mac addresses
 # and assuming they are BMC related and printing nodeattrib commands
diff --git a/confluent_server/bin/collective b/confluent_server/bin/collective
index 27b12566..aba64680 100644
--- a/confluent_server/bin/collective
+++ b/confluent_server/bin/collective
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 import argparse
 import errno
diff --git a/confluent_server/bin/confluent b/confluent_server/bin/confluent
index 4f1d73f4..62d6ab3d 100755
--- a/confluent_server/bin/confluent
+++ b/confluent_server/bin/confluent
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
diff --git a/confluent_server/bin/confluentdbutil b/confluent_server/bin/confluentdbutil
index d14de99c..0122b782 100755
--- a/confluent_server/bin/confluentdbutil
+++ b/confluent_server/bin/confluentdbutil
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
diff --git a/confluent_server/bin/confluentsrv.py b/confluent_server/bin/confluentsrv.py
index 4f1d73f4..62d6ab3d 100644
--- a/confluent_server/bin/confluentsrv.py
+++ b/confluent_server/bin/confluentsrv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
diff --git a/confluent_server/confluentdbgcli.py b/confluent_server/confluentdbgcli.py
index 4ed804b5..6c804cc3 100644
--- a/confluent_server/confluentdbgcli.py
+++ b/confluent_server/confluentdbgcli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
diff --git a/confluent_server/dbgtools/confluentdbgcli.py b/confluent_server/dbgtools/confluentdbgcli.py
index 59f897dc..ad9314e8 100644
--- a/confluent_server/dbgtools/confluentdbgcli.py
+++ b/confluent_server/dbgtools/confluentdbgcli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
diff --git a/confluent_server/dbgtools/processhangtraces.py b/confluent_server/dbgtools/processhangtraces.py
index 329efe29..98698ad4 100644
--- a/confluent_server/dbgtools/processhangtraces.py
+++ b/confluent_server/dbgtools/processhangtraces.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 # Copyright 2017 Lenovo
 #
diff --git a/misc/disablepasscomplexity.py b/misc/disablepasscomplexity.py
index ac2a62c8..01628e38 100644
--- a/misc/disablepasscomplexity.py
+++ b/misc/disablepasscomplexity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 import pyghmi.util.webclient as webclient
 import json
 import os
diff --git a/misc/fixexpiry.py b/misc/fixexpiry.py
index 3359c2fa..f2d6fa45 100644
--- a/misc/fixexpiry.py
+++ b/misc/fixexpiry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 import pyghmi.util.webclient as webclient
 import json
 import os
diff --git a/misc/fixsmmexpiry.py b/misc/fixsmmexpiry.py
index 6b4f8314..649b3c73 100644
--- a/misc/fixsmmexpiry.py
+++ b/misc/fixsmmexpiry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 import pyghmi.util.webclient as webclient
 from xml.etree.ElementTree import fromstring
 import os