Update message when keys are NOT being injected

[andrijapanicsb]

Description

When the injectkeys.sh script runs, if the public ssh key is the same as the authorized_keys file inside the extracted systemvm.iso - then the public ssh key files is NOT copied over and the systemvm.iso is not modified - message added to explain just that.

Also, after the injectkeys.sh is run/finished, from the Java code we currently generate a wrong message that the private key has also been injected (we don't inject it, only the public key) - and in general sometimes NOTHING is injected - so changed the messages accordingly.

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)

How Has This Been Tested?

Restarted the mgmt server for an existing installation, injectkeys.ssh was run, and confirmed that the systemvm.iso is NOT modified, same modification date, same md5sum as before.
Message properly logged in the mgmt logs, as follows:

2020-01-09 22:28:08,777 DEBUG [c.c.s.ConfigurationServerImpl] (main:null) (logid:) Executing: /bin/bash /usr/share/cloudstack-common/scripts/vm/systemvm/injectkeys.sh /var/cloudstack/management/.ssh/id_rsa.pub /var/cloudstack/management/.ssh/id_rsa /usr/share/cloudstack-common/vms/systemvm.iso
2020-01-09 22:28:08,897 DEBUG [c.c.s.ConfigurationServerImpl] (main:null) (logid:) Execution is successful.
2020-01-09 22:28:08,898 DEBUG [c.c.s.ConfigurationServerImpl] (main:null) (logid:) New public key is the same as the one in the systemvm.iso, not injecting it, not modifying systemvm.iso
2020-01-09 22:28:08,898 INFO [c.c.s.ConfigurationServerImpl] (main:null) (logid:) The script injectkeys.sh was run with result : null

[andrijapanicsb]

@blueorangutan package

[blueorangutan]

@andrijapanicsb a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-563

[andrijapanicsb]

@blueorangutan test centos7 vmware-65u2

[blueorangutan]

@andrijapanicsb a Trillian-Jenkins test job (centos7 mgmt + vmware-65u2) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-742)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 37483 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3799-t742-vmware-65u2.zip
Smoke tests completed. 78 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[andrijapanicsb]

2020-01-10 00:06:19,449 DEBUG [c.c.s.ConfigurationServerImpl] (DirectAgent-5:ctx-2e05c809 10.2.2.71, job-1/job-27, cmd: StartCommand) (logid:1686008a) Executing: /bin/bash /usr/share/cloudstack-common/scripts/vm/systemvm/injectkeys.sh /var/cloudstack/management/.ssh/id_rsa.pub /var/cloudstack/management/.ssh/id_rsa /usr/share/cloudstack-common/vms/systemvm.iso
2020-01-10 00:06:19,535 INFO [c.c.s.ConfigurationServerImpl] (DirectAgent-5:ctx-2e05c809 10.2.2.71, job-1/job-27, cmd: StartCommand) (logid:1686008a) The script injectkeys.sh was run with result : null

Looks good.

[DaanHoogland]

just messages improved. log scrapping might be impacted but in this case it should IMNSHO

[nvazquez]

Code LGTM

[andrijapanicsb]

Merging based on 2 x LGMT/approval and automated tests passing, and manual testing (by me).