Skip to content

Commit 759eebf

Browse files
author
Gabor Solya
committed
CB-18691 : [RHEL8] Upgrade Py3.6 to Py3.8 | MAIN_PATCHED_SCRIPT_PATH
1 parent 7f7fdc2 commit 759eebf

File tree

1 file changed

+2
-2
lines changed
  • freeipa/src/main/resources/freeipa-salt/salt/monitoring/scripts

1 file changed

+2
-2
lines changed

freeipa/src/main/resources/freeipa-salt/salt/monitoring/scripts/cipa.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import shutil
66
import sys
77

8-
MAIN_PATCHED_SCRIPT="/usr/local/lib/python3.6/site-packages/checkipaconsistency/main.py"
8+
MAIN_PATCHED_SCRIPT = "/usr/local/lib/python" + str(sys.version_info.major) + "." + str(sys.version_info.minor) + "/site-packages/checkipaconsistency/main.py"
99
CIPA_METRICS_PATH="/var/lib/node_exporter/files/cipa.prom"
1010
CIPA_CONFIG_PATH="/root/.config/checkipaconsistency"
1111
CIPA_BIN_PATH="/usr/local/bin/cipa"
@@ -27,7 +27,7 @@ def check_content(fname):
2727
def main():
2828
global MAIN_PATCHED_SCRIPT, CIPA_METRICS_PATH, CIPA_CONFIG_PATH, CIPA_BIN_PATH
2929
if not os.path.exists(MAIN_PATCHED_SCRIPT) or not check_content(MAIN_PATCHED_SCRIPT):
30-
print("No cipa tool installed or OpenMetrics format output is not supported.")
30+
print("No cipa tool installed or OpenMetrics format output is not supported. Package location path: " + MAIN_PATCHED_SCRIPT)
3131
sys.exit(0)
3232
if not os.path.exists(CIPA_BIN_PATH) or not os.path.exists(CIPA_CONFIG_PATH):
3333
print("[SKIP] cipa tool is required (with root config).")

0 commit comments

Comments
 (0)