Преглед изворни кода

Merge pull request #7651 from smarterclayton/refactor_8

Automatic merge from submit-queue.

Ensure master-logs works for both origin and enterprise

Extracted from #7486
OpenShift Merge Robot пре 7 година
родитељ
комит
37a0636c1f
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      roles/openshift_control_plane/files/scripts/docker/master-logs

+ 3 - 2
roles/openshift_control_plane/files/scripts/docker/master-logs

@@ -9,12 +9,13 @@ if [[ -z "${1-}" || -z "${2-}" ]]; then
 fi
 
 # container name is ignored for services
-for type in ( "atomic-openshift"  "origin" ); then
+types=( "atomic-openshift" "origin" )
+for type in "${types[@]}"; do
   if systemctl cat "${type}-master-${1}.service" &>/dev/null; then
     journalctl -u "${type}-master-${1}.service" "${@:3}"
     exit 0
   fi
-fi
+done
 
 # TODO: move to cri-ctl
 # TODO: short term hack for cri-o