X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=3f7dd6a5bf3433ca0bf68ed7abf6d36fa922c4eb;hb=6eefde1f463638b5021c2ec96eb67a017d379f1f;hp=cd50da09568bd83d135c6a8c67dbd51dcbe7161e;hpb=35adc33717a2a9ca867c5a624904a963d8449ae6;p=releng%2Fglobal-jjb.git diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh index cd50da09..3f7dd6a5 100644 --- a/shell/jenkins-configure-clouds.sh +++ b/shell/jenkins-configure-clouds.sh @@ -158,7 +158,7 @@ get_minion_options() { security_groups=$(get_cfg "$cfg_file" SECURITY_GROUPS "default") availability_zone=$(get_cfg "$cfg_file" AVAILABILITY_ZONE "") start_timeout=$(get_cfg "$cfg_file" START_TIMEOUT "600000") - key_pair_name=$(get_cfg "$cfg_file" KEY_PAIR_NAME "jenkins") + key_pair_name=$(get_cfg "$cfg_file" KEY_PAIR_NAME "jenkins-ssh") num_executors=$(get_cfg "$cfg_file" NUM_EXECUTORS "1") jvm_options=$(get_cfg "$cfg_file" JVM_OPTIONS "") fs_root=$(get_cfg "$cfg_file" FS_ROOT "/w") @@ -181,7 +181,7 @@ get_minion_options() { echo " $num_executors," echo " \"$jvm_options\"," echo " \"$fs_root\"," - echo " new LauncherFactory.SSH(\"jenkins\", \"\")," + echo " new LauncherFactory.SSH(\"$key_pair_name\", \"\")," echo " $retention_time" }