Forráskód Böngészése

Merge pull request #9688 from Miciah/sdn-check-use-openshift_client_binary

SDN check: Use openshift_client_binary
OpenShift Merge Robot 6 éve
szülő
commit
ab0dcca57c

+ 4 - 1
roles/openshift_health_checker/openshift_checks/sdn.py

@@ -58,7 +58,10 @@ class SDNCheck(OpenShiftCheck):
                 if not self.get_var('openshift_use_crio_only', default=False):
                 if not self.get_var('openshift_use_crio_only', default=False):
                     self.save_command_output('docker-version',
                     self.save_command_output('docker-version',
                                              ['/bin/docker', 'version'])
                                              ['/bin/docker', 'version'])
-                self.save_command_output('oc-version', ['/bin/oc', 'version'])
+                oc_executable = self.get_var('openshift_client_binary',
+                                             default='/bin/oc')
+                self.save_command_output('oc-version', [oc_executable,
+                                                        'version'])
                 self.register_file('os-version', None,
                 self.register_file('os-version', None,
                                    '/etc/system-release-cpe')
                                    '/etc/system-release-cpe')
             except OpenShiftCheckException as exc:
             except OpenShiftCheckException as exc: