Skip to content

Update message when keys are NOT being injected #3799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrijapanicsb merged 6 commits into from
Jan 18, 2020
Merged

Update message when keys are NOT being injected #3799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c6fed4
Update message when keys are NOT being injected
andrijapanicsb Jan 9, 2020
a40d800
Correct the message after injectkeys.ssh is done
andrijapanicsb Jan 9, 2020
75aa898
Update message to a more meaningful one, since sometimes nothing is i…
andrijapanicsb Jan 9, 2020
e8d3395
Update other 2
andrijapanicsb Jan 9, 2020
2e78f28
typo
andrijapanicsb Jan 9, 2020
2cf90f8
Merge branch 'master' into update-injectkeys.ssh-message
andrijapanicsb Jan 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/vm/systemvm/injectkeys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ inject_into_iso() {
[ ! -f $isofile ] && echo "$(basename $0): Could not find systemvm iso patch file $isofile" && return 1
$SUDO mount -o loop $isofile $MOUNTPATH
[ $? -ne 0 ] && echo "$(basename $0): Failed to mount original iso $isofile" && clean_up && return 1
diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && clean_up && return 0
diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && echo "New public key is the same as the one in the systemvm.iso, not injecting it, not modifying systemvm.iso" && clean_up && return 0
$SUDO cp -b $isofile $backup
[ $? -ne 0 ] && echo "$(basename $0): Failed to backup original iso $isofile" && clean_up && return 1
rm -rf $TMPDIR
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,10 +767,10 @@ protected void injectSshKeysIntoSystemVmIsoPatch(String publicKeyPath, String pr
command.add(systemVmIsoPath);

final String result = command.execute();
s_logger.info("Injected public and private keys into systemvm iso with result : " + result);
s_logger.info("The script injectkeys.sh was run with result : " + result);
if (result != null) {
s_logger.warn("Failed to inject generated public key into systemvm iso " + result);
throw new CloudRuntimeException("Failed to inject generated public key into systemvm iso " + result);
s_logger.warn("The script injectkeys.sh failed to run successfully : " + result);
throw new CloudRuntimeException("The script injectkeys.sh failed to run successfully : " + result);
}
}

Expand Down